Move PKG_RESOURCES_CACHE_ZIP_MANIFESTS config to envvars

diff --git a/files/envvars.jessie b/files/envvars.jessie
index 1cfcd643a2bc61ee341040716ffff60cee01ec9c..93b5d37c98356a78eedf15d719df02bea0fa7fa8 100644 (file)
--- 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 3b7332e0957c082ed628fd0d1be21f604261f288..1cabce5ba2f856a778071708f17b13c527316124 100644 (file)
--- 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