Merge pull request #149 from dexbleeker/master

Add user-defined envvars
This commit is contained in:
Niels Abspoel 2016-09-15 17:11:10 +02:00 committed by GitHub
commit ffec46e8d5
2 changed files with 8 additions and 0 deletions

View File

@ -37,3 +37,7 @@ export LANG
## If you need a higher file descriptor limit, uncomment and adjust the ## If you need a higher file descriptor limit, uncomment and adjust the
## following line (default is 8192): ## following line (default is 8192):
#APACHE_ULIMIT_MAX_FILES='ulimit -n 65536' #APACHE_ULIMIT_MAX_FILES='ulimit -n 65536'
{%- for envvar in salt['pillar.get']('apache:envvars', []) %}
{{ envvar }}
{%- endfor %}

View File

@ -47,3 +47,7 @@ export LANG
## This will produce a verbose output on package installations of web server modules and web application ## This will produce a verbose output on package installations of web server modules and web application
## installations which interact with Apache ## installations which interact with Apache
#export APACHE2_MAINTSCRIPT_DEBUG=1 #export APACHE2_MAINTSCRIPT_DEBUG=1
{%- for envvar in salt['pillar.get']('apache:envvars', []) %}
{{ envvar }}
{%- endfor %}