Envvars LANG issue moved to apache module

diff --git a/files/envvars.wheezy b/files/envvars.wheezy
deleted file mode 100644 (file)
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 530d3999ff8d679ef014c062069b41e57320b627..74bdf41df37576ae82efae215da51b4b54192cfb 100644 (file)
--- 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