X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=c98464c37fa39af83c194601ec1817bcd71efe45;hb=fd2dbf1eb15d270f6a9f4f8467ba819a91f4d32f;hp=0acc1b9f276fcdfc311466670715a60fcbb76093;hpb=c41841205ebbfc812fb00a775abca0d7239d3496;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 0acc1b9f2..c98464c37 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -10,10 +10,6 @@ class roles::static_mirror {
 	apache2::module { 'rewrite': }
 	apache2::module { 'expires': }
 
-	apache2::config { "local-static-vhost.conf":
-		source  => "puppet:///modules/roles/static-mirroring/static-vhost.conf",
-	}
-
 	file { '/usr/local/bin/static-mirror-run':
 		source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
 		mode   => '0555',
@@ -35,12 +31,16 @@ class roles::static_mirror {
 		default => '*:80',
 	}
 
+	apache2::config { "local-static-vhost.conf":
+		content => template('roles/static-mirroring/static-vhost.conf.erb'),
+	}
+
 	apache2::site { '010-planet.debian.org':
 		site    => 'planet.debian.org',
 		content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
 	}
 
-	apache2::site { '10-static-vhosts-simple':
+	apache2::site { '010-static-vhosts-simple':
 		site => "static-vhosts-simple",
 		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
 	}