summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-08-02 11:37:43 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-08-02 11:37:43 -0300
commit26030ac3b7117a33b9f87fabe40c49d1398f331b (patch)
tree2397d41dda0be21f7d515c3b5a9eebbd130c1edd
parent1a9b3b16963c2bfb9e07b8ac8a5f30cafe5fa158 (diff)
downloadpuppet-apache-26030ac3b7117a33b9f87fabe40c49d1398f331b.tar.gz
puppet-apache-26030ac3b7117a33b9f87fabe40c49d1398f331b.tar.bz2
Upgrades envvars to jessie's version
-rw-r--r--files/envvars9
1 files changed, 7 insertions, 2 deletions
diff --git a/files/envvars b/files/envvars
index c8dea87..91328ac 100644
--- a/files/envvars
+++ b/files/envvars
@@ -15,7 +15,8 @@ fi
# /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
+# 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.
@@ -36,7 +37,11 @@ export LANG
## 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