saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apache.global for Debian and FreeBSD

Browse Source
This commit is contained in:
Alexander Weidinger 2017-01-08 13:13:40 +01:00
parent f03df6e2fb
commit 9f796f0b6a
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/files/Debian/apache-2.2.config.jinja
View File

@ -227,6 +227,10 @@ LogFormat "%h %l %u %t \"%r\" %>s %O" common
LogFormat "%{Referer}i -> %U" referer LogFormat "%{Referer}i -> %U" referer
LogFormat "%{User-agent}i" agent 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, # Include of directories ignores editors' and dpkg's backup files,
# see README.Debian for details. # see README.Debian for details.

4
apache/files/Debian/apache-2.4.config.jinja
View File

@ -211,6 +211,10 @@ LogFormat "%{User-agent}i" agent
LogFormat {{ log_format }} LogFormat {{ log_format }}
{%- endfor %} {%- endfor %}
{%- for directive, dvalue in salt['pillar.get']('apache:global', {}).items() %}
{{ directive }} {{ dvalue }}
{%- endfor %}
# Include of directories ignores editors' and dpkg's backup files, # Include of directories ignores editors' and dpkg's backup files,
# see README.Debian for details. # see README.Debian for details.

4
apache/files/FreeBSD/apache-2.4.config.jinja
View File

@ -230,6 +230,10 @@ ServerAdmin root@localhost
# below. # 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 %} {% if apache.global_document_root is defined and apache.global_document_root|length > 0 %}
# #
# DocumentRoot: The directory out of which you will serve your # DocumentRoot: The directory out of which you will serve your