From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 2 Aug 2015 14:37:43 +0000 (-0300)
Subject: Upgrades envvars to jessie's version
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=26030ac3b7117a33b9f87fabe40c49d1398f331b;p=puppet-apache.git

Upgrades envvars to jessie's version
---

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