X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Fweb.pp;h=ca238672d7a5eb6ad0a7ccfe48dcc4f4c41bf375;hb=f7f9a79a4a29afeb59229670b2ad92bb9c209f92;hp=43489fb7378497b0963ba0c8a5eba58dc761f2fc;hpb=c33dfb62ca19f76e961de79af216905b75d98394;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
index 43489fb73..ca238672d 100644
--- a/modules/salsa/manifests/web.pp
+++ b/modules/salsa/manifests/web.pp
@@ -7,8 +7,10 @@ class salsa::web inherits salsa {
 
 	ssl::service { [
 		'salsa.debian.org',
+		'registry.salsa.debian.org',
 		'signup.salsa.debian.org',
 		'webhook.salsa.debian.org',
+		'pages.debian.net',
 		]:
 		notify  => Exec['service apache2 reload'],
 		key => true,
@@ -18,15 +20,23 @@ class salsa::web inherits salsa {
 		site    => 'salsa.debian.org',
 		content => template('salsa/apache-salsa.debian.org.conf.erb'),
 	}
-	apache2::site { '010-signup.salsa.debian.org':
+	apache2::site { '010-registry.salsa.debian.org': ensure => absent, }
+	apache2::site { '011-registry.salsa.debian.org':
+		site    => 'registry.salsa.debian.org',
+		content => template('salsa/apache-registry.salsa.debian.org.conf.erb'),
+	}
+	apache2::site { '010-signup.salsa.debian.org': ensure => absent, }
+	apache2::site { '011-signup.salsa.debian.org':
 		site    => 'signup.salsa.debian.org',
 		content => template('salsa/apache-signup.salsa.debian.org.conf.erb'),
 	}
-	apache2::site { '010-webhook.salsa.debian.org':
+	apache2::site { '010-webhook.salsa.debian.org': ensure => absent, }
+	apache2::site { '011-webhook.salsa.debian.org':
 		site    => 'webhook.salsa.debian.org',
 		content => template('salsa/apache-webhook.salsa.debian.org.conf.erb'),
 	}
-	apache2::site { '010-pages.debian.net':
+	apache2::site { '010-pages.debian.net': ensure => absent, }
+	apache2::site { '011-pages.debian.net':
 		site    => 'pages.debian.net',
 		content => template('salsa/apache-pages.debian.net.conf.erb'),
 	}