diff --git a/apache/config.sls b/apache/config.sls index 29bc7e2..1d63599 100644 --- a/apache/config.sls +++ b/apache/config.sls @@ -71,6 +71,16 @@ include: {% endif %} {% if grains['os_family']=="FreeBSD" %} +/usr/local/etc/{{ apache.service }}/envvars.d/by_salt.env: + file.managed: + - template: jinja + - source: + - salt://apache/files/{{ salt['grains.get']('os_family') }}/envvars-{{ apache.version }}.jinja + - require: + - pkg: apache + - watch_in: + - service: apache + {{ apache.portsfile }}: file.managed: - template: jinja diff --git a/apache/files/FreeBSD/envvars-2.4.jinja b/apache/files/FreeBSD/envvars-2.4.jinja new file mode 100644 index 0000000..a3cac31 --- /dev/null +++ b/apache/files/FreeBSD/envvars-2.4.jinja @@ -0,0 +1,53 @@ +# Managed by saltstack + +# envvars - default environment variables for apache2ctl + +# this won't be correct after changing uid +unset HOME + +# for supporting multiple apache2 instances +if [ "${APACHE_CONFDIR##/etc/apache2-}" != "${APACHE_CONFDIR}" ] ; then + SUFFIX="-${APACHE_CONFDIR##/etc/apache2-}" +else + SUFFIX= +fi + +# Since there is no sane way to get the parsed apache2 config in scripts, some +# settings are defined via environment variables and then used in apache2ctl, +# /etc/init.d/apache2, /etc/logrotate.d/apache2, etc. +export APACHE_RUN_USER={{ salt['pillar.get']('apache:user', 'www-data') }} +export APACHE_RUN_GROUP={{ salt['pillar.get']('apache:group', 'www-data') }} +# temporary state file location. This might be changed to /run in Wheezy+1 +export APACHE_PID_FILE=/var/run/apache2/apache2$SUFFIX.pid +export APACHE_RUN_DIR=/var/run/apache2$SUFFIX +export APACHE_LOCK_DIR=/var/lock/apache2$SUFFIX +# Only /var/log/apache2 is handled by /etc/logrotate.d/apache2. +export APACHE_LOG_DIR=/var/log/apache2$SUFFIX + +## The locale used by some modules like mod_dav +export LANG=C +## Uncomment the following line to use the system default locale instead: +#. /etc/default/locale + +export LANG + +## The command to get the status for 'apache2ctl status'. +## Some packages providing 'www-browser' need '--dump' instead of '-dump'. +#export APACHE_LYNX='www-browser -dump' + +## If you need a higher file descriptor limit, uncomment and adjust the +## following line (default is 8192): +#APACHE_ULIMIT_MAX_FILES='ulimit -n 65536' + +## If you would like to pass arguments to the web server, add them below +## to the APACHE_ARGUMENTS environment. +#export APACHE_ARGUMENTS='' + +## Enable the debug mode for maintainer scripts. +## 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 %}