X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=cf252d4bafb15db01febeb3152fc0284531bd14b;hb=4fd87c46d590f873f1953302a9ac069714fcafc1;hp=da7b5a50d96f34dbaa60d3935619fcf081e0715d;hpb=9f7c89a4e68c7bfd5f3cafd67d4071f4ab0d2784;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index da7b5a50d..cf252d4ba 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -1,105 +1,5 @@
-class roles::static_mirror {
-
-	include roles::static_source
-	include apache2::cache
-
-	package { 'libapache2-mod-geoip': ensure => installed, }
-	package { 'geoip-database': ensure => installed, }
-
-	include apache2::ssl
-	apache2::module { 'include': }
-	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 { '/usr/local/bin/static-mirror-run-all':
-		source => 'puppet:///modules/roles/static-mirroring/static-mirror-run-all',
-		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",
-	}
-
-	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
-		mirror-isc => '149.20.20.20:80 [2001:4f8:8:36::1deb:20]:80',
-		mirror-anu => '150.203.164.62:80 [2001:388:1034:2900::3e]:80',
-		default    => '*:80',
-	}
-	$vhost_listen_443 = $::hostname ? {
-		klecker    => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
-		mirror-isc => '149.20.20.20:443 [2001:4f8:8:36::1deb:20]:443',
-		mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443',
-		default    => '*:443',
-	}
-
-	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-lintian.debian.org':
-		site    => 'lintian.debian.org',
-		content => template('roles/static-mirroring/vhost/lintian.debian.org.erb'),
-	}
-
-	apache2::site { '010-static-vhosts-simple':
-		site => 'static-vhosts-simple',
-		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
-	}
-
-	$wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
-	apache2::site { '005-www.debian.org':
-		site   => 'www.debian.org',
-		content => template('roles/apache-www.debian.org.erb'),
-	}
-
-	ssl::service { 'dsa.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'www.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'bits.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'lintian.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'rtc.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'appstream.debian.org':
-		notify => Service['apache2'],
-	}
-	ssl::service { 'd-i.debian.org':
-		notify => Service['apache2'],
-	}
-
-	if has_static_component('news.debian.net'     ) { ssl::service { 'news.debian.net'     : notify => Service['apache2'], key => true, } }
-	if has_static_component('debaday.debian.net'  ) { ssl::service { 'debaday.debian.net'  : notify => Service['apache2'], key => true, } }
-	if has_static_component('timeline.debian.net' ) { ssl::service { 'timeline.debian.net' : notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf0.debconf.org') { ssl::service { 'debconf0.debconf.org': notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf1.debconf.org') { ssl::service { 'debconf1.debconf.org': notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf2.debconf.org') { ssl::service { 'debconf2.debconf.org': notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf3.debconf.org') { ssl::service { 'debconf3.debconf.org': notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf4.debconf.org') { ssl::service { 'debconf4.debconf.org': notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf5.debconf.org') { ssl::service { 'debconf5.debconf.org': notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf6.debconf.org') { ssl::service { 'debconf6.debconf.org': notify => Service['apache2'], key => true, } }
-	if has_static_component('debconf7.debconf.org') { ssl::service { 'debconf7.debconf.org': notify => Service['apache2'], key => true, } }
+# 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
 }