From 9f796f0b6a6217464479e4cb912074aa07ed366a Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Sun, 8 Jan 2017 13:13:40 +0100 Subject: [PATCH] apache.global for Debian and FreeBSD --- apache/files/Debian/apache-2.2.config.jinja | 4 ++++ apache/files/Debian/apache-2.4.config.jinja | 4 ++++ apache/files/FreeBSD/apache-2.4.config.jinja | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/apache/files/Debian/apache-2.2.config.jinja b/apache/files/Debian/apache-2.2.config.jinja index 6895993..358f043 100644 --- a/apache/files/Debian/apache-2.2.config.jinja +++ b/apache/files/Debian/apache-2.2.config.jinja @@ -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. diff --git a/apache/files/Debian/apache-2.4.config.jinja b/apache/files/Debian/apache-2.4.config.jinja index 854fc2d..53d1db4 100644 --- a/apache/files/Debian/apache-2.4.config.jinja +++ b/apache/files/Debian/apache-2.4.config.jinja @@ -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. diff --git a/apache/files/FreeBSD/apache-2.4.config.jinja b/apache/files/FreeBSD/apache-2.4.config.jinja index 0625ff7..2f9b8ec 100644 --- a/apache/files/FreeBSD/apache-2.4.config.jinja +++ b/apache/files/FreeBSD/apache-2.4.config.jinja @@ -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