X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=bcd32e59f0b8651ab9b8cc53f4b8ee4d4e9ced2b;hb=fc2e31cc93966603ccbe9a5dbcf3684cef9450e3;hp=5dcb326360e77a0b8ac4fff8c0f686ee3c185bf2;hpb=3974c005ea8a7784afc4e5505feda5f6d1de7a15;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 5dcb32636..bcd32e59f 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,6 +1,6 @@
 class roles::static_mirror {
-
-	include roles::static_source
+	include roles::static_base
+	include roles::static_srvdir
 	include apache2::expires
 	include apache2::rewrite
 
@@ -21,13 +21,6 @@ class roles::static_mirror {
 		mode   => '0555',
 	}
 
-	file { '/srv/static.debian.org':
-		ensure => directory,
-		owner  => staticsync,
-		group  => staticsync,
-		mode   => '02755'
-	}
-
 	file { '/etc/cron.d/puppet-static-mirror':
 			content => "MAILTO=root\nPATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; chronic static-mirror-run-all\n",
 	}