Browse Source

apache.global for Debian and FreeBSD

tags/v0.37.4
Alexander Weidinger 8 years ago
parent
commit
9f796f0b6a
3 changed files with 12 additions and 0 deletions
  1. +4
    -0
      apache/files/Debian/apache-2.2.config.jinja
  2. +4
    -0
      apache/files/Debian/apache-2.4.config.jinja
  3. +4
    -0
      apache/files/FreeBSD/apache-2.4.config.jinja

+ 4
- 0
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 "%{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.


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

@@ -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.


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

@@ -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

Loading…
Cancel
Save