From 150d2fb83234bca36ef37a25dfb18ca6086494b5 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 2 Aug 2015 11:46:58 -0300
Subject: Manage /etc/apache2/envvars on vservers

---
 files/envvars         | 47 -----------------------------------------------
 files/envvars.vserver | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 manifests/init.pp     | 12 ++++++++++++
 3 files changed, 62 insertions(+), 47 deletions(-)
 delete mode 100644 files/envvars
 create mode 100644 files/envvars.vserver

diff --git a/files/envvars b/files/envvars
deleted file mode 100644
index 91328ac..0000000
--- a/files/envvars
+++ /dev/null
@@ -1,47 +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
-# 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
diff --git a/files/envvars.vserver b/files/envvars.vserver
new file mode 100644
index 0000000..b5c749f
--- /dev/null
+++ b/files/envvars.vserver
@@ -0,0 +1,50 @@
+# 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
+# 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'
+
+# 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=''
+
+## 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
diff --git a/manifests/init.pp b/manifests/init.pp
index 2196b55..d4ea486 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -226,6 +226,18 @@ class apache(
     },
   }
 
+  file { '/etc/apache2/envvars' :
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    source  => $::virtual ? {
+      'vserver' => 'puppet:///modules/apache/envvars.vserver',
+      default   => undef,
+    },
+    notify  => Service["apache"],
+  }
+
   # Legacy configuration
   file { "$conf_d/macros":
     ensure => absent,
-- 
cgit v1.2.3