diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-08-02 12:52:09 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-08-02 12:52:09 -0300 |
| commit | cc052353fe4eb9cad153440ad956768e5ed65ce7 (patch) | |
| tree | 95ddb91da5030732b163ca1a6472120e90e08ecf | |
| parent | 1658794f138827a7d4d115d4896d93c65b937a64 (diff) | |
| download | puppet-puppet-cc052353fe4eb9cad153440ad956768e5ed65ce7.tar.gz puppet-puppet-cc052353fe4eb9cad153440ad956768e5ed65ce7.tar.bz2 | |
Envvars LANG issue moved to apache module
| -rw-r--r-- | files/envvars.wheezy | 37 | ||||
| -rw-r--r-- | manifests/master/passenger.pp | 7 |
2 files changed, 0 insertions, 44 deletions
diff --git a/files/envvars.wheezy b/files/envvars.wheezy deleted file mode 100644 index bfebfc4..0000000 --- a/files/envvars.wheezy +++ /dev/null @@ -1,37 +0,0 @@ -# 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 530d399..74bdf41 100644 --- a/manifests/master/passenger.pp +++ b/manifests/master/passenger.pp @@ -7,13 +7,6 @@ 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 - class { 'apache::envvars': - source => "puppet:///modules/puppet/envvars.${::lsbdistcodename}", - } - # then include puppet class include puppet::daemon |