diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 59bcd3f6b7..755883ef75 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -347,9 +347,22 @@ class zuul (
ensure => present,
}
}
- if ! defined(A2mod['mem_cache']) {
- a2mod { 'mem_cache':
- ensure => present,
+
+ case $::lsbdistcodename {
+ 'precise': {
+ if ! defined(A2mod['mem_cache']) {
+ a2mod { 'mem_cache':
+ ensure => present,
+ }
+ }
+ }
+ default: {
+ if ! defined(A2mod['cache_disk']) {
+ a2mod { 'cache_disk':
+ ensure => present,
+ }
+ }
}
}
+
}
diff --git a/modules/zuul/templates/zuul.vhost.erb b/modules/zuul/templates/zuul.vhost.erb
index ba31723b34..dfa473b191 100644
--- a/modules/zuul/templates/zuul.vhost.erb
+++ b/modules/zuul/templates/zuul.vhost.erb
@@ -2,6 +2,11 @@
ServerAdmin <%= scope.lookupvar("::zuul::serveradmin") %>
DocumentRoot /var/lib/zuul/www
+
+ Allow from all
+ Satisfy Any
+
+
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-error.log
LogLevel warn
@@ -32,6 +37,10 @@
MCacheMaxObjectSize 8388608
MCacheMaxStreamingBuffer 8388608
+
+ CacheEnable disk /status.json
+ CacheRoot /var/cache/apache2/mod_cache_disk
+