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

diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
index 195e04080..ca238672d 100644
--- a/modules/salsa/manifests/web.pp
+++ b/modules/salsa/manifests/web.pp
@@ -5,9 +5,13 @@ class salsa::web inherits salsa {
 	include apache2::rewrite
 	include apache2::ssl
 
-	ssl::service { [ 'salsa.debian.org',
-	                 'signup.salsa.debian.org',
-	               ]:
+	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,
 	}
@@ -16,10 +20,24 @@ class salsa::web inherits salsa {
 		site    => 'salsa.debian.org',
 		content => template('salsa/apache-salsa.debian.org.conf.erb'),
 	}
-	apache2::site { '010-pages.debian.net':
+	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': 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': ensure => absent, }
+	apache2::site { '011-pages.debian.net':
 		site    => 'pages.debian.net',
 		content => template('salsa/apache-pages.debian.net.conf.erb'),
 	}
-
-
 }