X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=8dd1bb850ce13ad7e45ec9c86bfcc6d344e40dd1;hb=ba4f3445de0a6052344f998cb29f38d525a52bdc;hp=1aa20d773c45254d464822ecfc3857161f8f03f3;hpb=b5b17876a34290b9816805a274c81a2ffc209145;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 1aa20d773..8dd1bb850 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -2,13 +2,14 @@ class roles::static_mirror {
 
 	include roles::static_source
 
-	package { 'libapache2-mod-macro':
-		ensure => installed,
-	}
+	package { 'libapache2-mod-macro': ensure => installed, }
+	package { 'libapache2-mod-geoip': ensure => installed, }
+	package { 'geoip-database': ensure => installed, }
 
 	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':
 		source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',
@@ -31,8 +32,17 @@ 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 { '010-static-vhosts-simple':
+		site => "static-vhosts-simple",
+		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
+	}
 }