@@ -227,6 +227,10 @@ LogFormat "%h %l %u %t \"%r\" %>s %O" common | |||
LogFormat "%{Referer}i -> %U" referer | |||
LogFormat "%{User-agent}i" agent | |||
{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %} | |||
{{ directive }} {{ dvalue }} | |||
{%- endfor %} | |||
# Include of directories ignores editors' and dpkg's backup files, | |||
# see README.Debian for details. | |||
@@ -211,6 +211,10 @@ LogFormat "%{User-agent}i" agent | |||
LogFormat {{ log_format }} | |||
{%- endfor %} | |||
{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %} | |||
{{ directive }} {{ dvalue }} | |||
{%- endfor %} | |||
# Include of directories ignores editors' and dpkg's backup files, | |||
# see README.Debian for details. | |||
@@ -230,6 +230,10 @@ ServerAdmin root@localhost | |||
# below. | |||
# | |||
{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %} | |||
{{ directive }} {{ dvalue }} | |||
{%- endfor %} | |||
{% if apache.global_document_root is defined and apache.global_document_root|length > 0 %} | |||
# | |||
# DocumentRoot: The directory out of which you will serve your |