X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=7d0cfb32c3be31f0e0df15b01aa0305925a5f9a2;hb=4b4d1fb6ea2b229c2fd454bbc01e295a9ee52705;hp=240a6bf0d2f0af9b86d9926de505f3e729a243de;hpb=8368310b0e5a5193c5703404f1390fd5c18066ff;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 240a6bf0d..7d0cfb32c 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,6 +1,7 @@
 class roles::static_mirror {
 
 	include roles::static_source
+	include apache2::cache
 
 	package { 'libapache2-mod-macro': ensure => installed, }
 	package { 'libapache2-mod-geoip': ensure => installed, }
@@ -8,7 +9,6 @@ class roles::static_mirror {
 
 	apache2::module { 'macro': require => Package['libapache2-mod-macro']; }
 	apache2::module { 'rewrite': }
-	apache2::module { 'expires': }
 	apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
 
 	file { '/usr/local/bin/static-mirror-run':
@@ -32,7 +32,7 @@ class roles::static_mirror {
 		default => '*:80',
 	}
 
-	apache2::config { "local-static-vhost.conf":
+	apache2::config { 'local-static-vhost.conf':
 		content => template('roles/static-mirroring/static-vhost.conf.erb'),
 	}
 
@@ -42,7 +42,7 @@ class roles::static_mirror {
 	}
 
 	apache2::site { '010-static-vhosts-simple':
-		site => "static-vhosts-simple",
+		site => 'static-vhosts-simple',
 		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
 	}