X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=cf252d4bafb15db01febeb3152fc0284531bd14b;hb=dcd05444f7179ed841fdb1cc786b6c1931724cbd;hp=01e5336fa51255651a8f3752e3eb5ef988e4e358;hpb=df8f24895ce2f6f71c54701f90faf530a4405213;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 01e5336fa..cf252d4ba 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,48 +1,5 @@
-class roles::static_mirror {
-
-	include roles::static_source
-
-	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',
-		mode   => '0555',
-	}
-
-	file { '/srv/static.debian.org':
-		ensure => directory,
-		owner  => staticsync,
-		group  => staticsync,
-		mode   => '02755'
-	}
-
-	file { '/etc/cron.d/puppet-static-mirror':
-			content => "PATH=/usr/local/bin:/usr/bin:/bin\n@reboot staticsync sleep 60; awk '!/^ *(#|$)/ {print \$1, \$2}' /etc/static-components.conf | while read master component; do static-mirror-run --one-stage /srv/static.debian.org/mirrors/\$component \"\$master:\$components/-live-\" > /dev/null; done\n",
-	}
-
-	$vhost_listen = $::hostname ? {
-		klecker => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
-		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'),
-	}
+# a static mirror.  It will get content for all components that it servers
+# from each component's master.
+class roles::static_mirror () {
+  include staticsync::static_mirror
 }