Use envvars according to distro version

5 files changed, 96 insertions, 2 deletions

diff --git a/files/envvars b/files/envvars.jessie
index 1cfcd64..1cfcd64 100644
--- a/files/envvars
+++ b/files/envvars.jessie
diff --git a/files/envvars.vserver b/files/envvars.vserver.jessie
index 8ab7097..8ab7097 100644
--- a/files/envvars.vserver
+++ b/files/envvars.vserver.jessie
diff --git a/files/envvars.vserver.wheezy b/files/envvars.vserver.wheezy
new file mode 100644
index 0000000..992af0c
--- /dev/null
+++ b/files/envvars.vserver.wheezy
@@ -0,0 +1,48 @@
+# 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:
+## Uncomment the following line to use the system default locale instead:
+## 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
+. /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'
+
+# Can't ulimit inside a vserver, so we avoid noise output at logrotate's cronjob
+APACHE_ULIMIT_MAX_FILES=''
+
+## If you would like to pass arguments to the web server, add them below
+## to the APACHE_ARGUMENTS environment.
+#export APACHE_ARGUMENTS=''
diff --git a/files/envvars.wheezy b/files/envvars.wheezy
new file mode 100644
index 0000000..a017efd
--- /dev/null
+++ b/files/envvars.wheezy
@@ -0,0 +1,46 @@
+# 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:
+## Uncomment the following line to use the system default locale instead:
+## 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
+. /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=''
diff --git a/manifests/init.pp b/manifests/init.pp
index 419c286..b8f7a72 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -241,8 +241,8 @@ class apache(
 
   class { 'apache::envvars':
     source  => $::virtual ? {
-      'vserver' => 'puppet:///modules/apache/envvars.vserver',
-      default   => 'puppet:///modules/apache/envvars',
+      'vserver' => "puppet:///modules/apache/envvars.vserver.${::lsbdistcodename}",
+      default   => "puppet:///modules/apache/envvars:${::lsbdistcodename}",
     },
   }