diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-02-28 00:10:51 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-02-28 00:10:51 -0300 |
| commit | b1ce037ab632a5813eedd168387ec80843dc1ca0 (patch) | |
| tree | 233612d2816958c233de17f493861f9173e9ad58 | |
| parent | ceacbb9189f865f2ef22894942636e7e78724840 (diff) | |
| download | puppet-puppet-b1ce037ab632a5813eedd168387ec80843dc1ca0.tar.gz puppet-puppet-b1ce037ab632a5813eedd168387ec80843dc1ca0.tar.bz2 | |
Add custom envvars apache config
| -rw-r--r-- | files/envvars.wheezy | 37 | ||||
| -rw-r--r-- | manifests/master/passenger.pp | 7 |
2 files changed, 44 insertions, 0 deletions
diff --git a/files/envvars.wheezy b/files/envvars.wheezy new file mode 100644 index 0000000..bfebfc4 --- /dev/null +++ b/files/envvars.wheezy @@ -0,0 +1,37 @@ +# 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=www-data +export APACHE_RUN_GROUP=www-data +export APACHE_PID_FILE=/var/run/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' diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp index d14c2e7..1c1e678 100644 --- a/manifests/master/passenger.pp +++ b/manifests/master/passenger.pp @@ -7,6 +7,13 @@ class puppet::master::passenger { include puppet::master::mongrel::disabled } + # We need a custom envvars apache config to set correct LANG env, see + # https://projects.puppetlabs.com/issues/11303 + # https://projects.puppetlabs.com/issues/11860 + apache::envvars { + source => "puppet:///modules/puppet/envvars.${::lsbdistcodename}", + } + # then include puppet class include puppet::daemon |