summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-27 18:40:50 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-27 18:40:50 -0300
commitb8f24180a8dafaf81db3bdba64900a8c598055e1 (patch)
tree7a53455568d0ab7bd69ecbad4242f4230b6c07ad
parentcad6704aaa186887a15f4be6cd0c51206cb434fc (diff)
downloadpuppet-apache-b8f24180a8dafaf81db3bdba64900a8c598055e1.tar.gz
puppet-apache-b8f24180a8dafaf81db3bdba64900a8c598055e1.tar.bz2
Move PKG_RESOURCES_CACHE_ZIP_MANIFESTS config to envvars
-rw-r--r--files/envvars.jessie3
-rw-r--r--templates/macros.erb3
2 files changed, 3 insertions, 3 deletions
diff --git a/files/envvars.jessie b/files/envvars.jessie
index 1cfcd64..93b5d37 100644
--- a/files/envvars.jessie
+++ b/files/envvars.jessie
@@ -48,3 +48,6 @@ export LANG
## 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
+
+# See https://groups.google.com/forum/#!topic/trac-users/TOoDwxhoztw
+export PKG_RESOURCES_CACHE_ZIP_MANIFESTS=1
diff --git a/templates/macros.erb b/templates/macros.erb
index 3b7332e..1cabce5 100644
--- a/templates/macros.erb
+++ b/templates/macros.erb
@@ -55,9 +55,6 @@
PythonOption TracEnv <%= scope.lookupvar('apache::sites_folder') %>/$site/trac
PythonOption TracUriRoot /trac
- # See https://groups.google.com/forum/#!topic/trac-users/TOoDwxhoztw
- SetEnv PKG_RESOURCES_CACHE_ZIP_MANIFESTS 1
-
# This prevents strange behavior when using trac
# in the same virtual host with software that
# has rewrite rules in .htaccess, such as drupal