@@ -42,3 +42,17 @@ include: | |||
- watch_in: | |||
- service: apache | |||
{% endif %} | |||
{% if grains['os_family']=="Suse" %} | |||
/etc/apache2/sysconfig.d/global.conf: | |||
file.managed: | |||
- template: jinja | |||
- source: | |||
- salt://apache/files/{{ salt['grains.get']('os_family') }}/global.config.jinja | |||
- require: | |||
- pkg: apache | |||
- watch_in: | |||
- service: apache | |||
- context: | |||
apache: {{ apache }} | |||
{% endif %} |
@@ -416,6 +416,10 @@ AddDefaultCharset UTF-8 | |||
#EnableMMAP off | |||
EnableSendfile on | |||
{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %} | |||
{{ directive }} {{ dvalue }} | |||
{%- endfor %} | |||
# Supplemental configuration | |||
# | |||
# Load config files in the "/etc/httpd/conf.d" directory, if any. |
@@ -350,6 +350,10 @@ AddDefaultCharset UTF-8 | |||
#EnableMMAP off | |||
EnableSendfile on | |||
{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %} | |||
{{ directive }} {{ dvalue }} | |||
{%- endfor %} | |||
# Supplemental configuration | |||
# | |||
# Load config files in the "/etc/httpd/conf.d" directory, if any. |
@@ -0,0 +1,4 @@ | |||
{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %} | |||
{{ directive }} {{ dvalue }} | |||
{%- endfor %} | |||
@@ -18,6 +18,11 @@ apache: | |||
# ``apache.mod_wsgi`` formula additional configuration: | |||
mod_wsgi: mod_wsgi | |||
global: | |||
# global apache directives | |||
AllowEncodedSlashes: "On" | |||
# ``apache.vhosts`` formula additional configuration: | |||
sites: | |||
example.net: |