X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_mirror.pp;h=8cead77439498423dfdd0ed4ba24260539d18190;hb=22f63daee2fb8fd94cf256933f8b6ae4c2c81364;hp=d9463666d3f9fec9de2c5255d2e9e174f5a0f84c;hpb=798432833682d45b877dc7b48ebcbc08cecb91fd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index d9463666d..8cead7743 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -49,6 +49,7 @@ class roles::static_mirror {
 		mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443',
 		default    => '*:443',
 	}
+	$redirect_vhosts = true
 
 	apache2::config { 'local-static-vhost.conf':
 		ensure => absent,
@@ -78,6 +79,7 @@ class roles::static_mirror {
 		content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
 	}
 
+	$wwwdo_server_name = 'www.debian.org'
 	$wwwdo_document_root = '/srv/static.debian.org/mirrors/www.debian.org/cur'
 	apache2::site { '005-www.debian.org':
 		site   => 'www.debian.org',
@@ -108,8 +110,14 @@ class roles::static_mirror {
 	ssl::service { 'lintian.debian.org'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'lists.alioth.debian.org'       : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'manpages.debian.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'metadata-backend.ftp-master.debian.org':
+		ensure => has_static_component('metadata.ftp-master.debian.org') ? { true => "present", false => "absent" },
+		notify  => Exec['service apache2 reload'],
+		key => true,
+	}
 	ssl::service { 'mirror-master.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'pkg-ruby-extras.alioth.debian.org' : ensure => "present",  notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'planet-backend.debian.org'     :
 		ensure => has_static_component('planet.debian.org') ? { true => "present", false => "absent" },
 		notify => Exec['service apache2 reload'],
@@ -137,6 +145,7 @@ class roles::static_mirror {
 	ssl::service { 'debconf16.debconf.org'         : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf17.debconf.org'         : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf18.debconf.org'         : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'debconf19.debconf.org'         : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf2.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf3.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'debconf4.debconf.org'          : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
@@ -226,4 +235,11 @@ class roles::static_mirror {
 		ensure => absent,
 	}
 
+	ssl::service { 'cdimage.debian.org': ensure => present, notify => Exec['service apache2 reload'], key => true, }
+	file { '/srv/static.debian.org/puppet/cdimage.debian.org':
+		ensure => directory,
+	}
+	file { '/srv/static.debian.org/puppet/cdimage.debian.org/503.html':
+		source => 'puppet:///modules/roles/static-htdocs/cdimage-maintenance.html',
+	}
 }