From 7b7deaeb5b63722e13a5cf7cbaaf1f1b1ff6bc3b Mon Sep 17 00:00:00 2001 From: Dex Bleeker Date: Sat, 16 Jul 2016 17:21:46 +0200 Subject: [PATCH] Add user-defined envvars --- apache/files/Debian/envvars-2.2.jinja | 4 ++++ apache/files/Debian/envvars-2.4.jinja | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/apache/files/Debian/envvars-2.2.jinja b/apache/files/Debian/envvars-2.2.jinja index cb32973..079a5a5 100644 --- a/apache/files/Debian/envvars-2.2.jinja +++ b/apache/files/Debian/envvars-2.2.jinja @@ -37,3 +37,7 @@ export LANG ## If you need a higher file descriptor limit, uncomment and adjust the ## following line (default is 8192): #APACHE_ULIMIT_MAX_FILES='ulimit -n 65536' + +{%- for envvar in salt['pillar.get']('apache:envvars', []) %} +{{ envvar }} +{%- endfor %} diff --git a/apache/files/Debian/envvars-2.4.jinja b/apache/files/Debian/envvars-2.4.jinja index d0b7a8c..a3cac31 100644 --- a/apache/files/Debian/envvars-2.4.jinja +++ b/apache/files/Debian/envvars-2.4.jinja @@ -47,3 +47,7 @@ export LANG ## This will produce a verbose output on package installations of web server modules and web application ## installations which interact with Apache #export APACHE2_MAINTSCRIPT_DEBUG=1 + +{%- for envvar in salt['pillar.get']('apache:envvars', []) %} +{{ envvar }} +{%- endfor %}