X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Fmanifests%2Fweb.pp;h=ca238672d7a5eb6ad0a7ccfe48dcc4f4c41bf375;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=a597a5ce479dabb577a6f1206a6eb53aa11c8557;hpb=9e1f74ad62a130347719115d4248d0dc1170d0c2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
index a597a5ce4..ca238672d 100644
--- a/modules/salsa/manifests/web.pp
+++ b/modules/salsa/manifests/web.pp
@@ -2,9 +2,16 @@
 class salsa::web inherits salsa {
 	include apache2
 	include apache2::proxy_http
+	include apache2::rewrite
 	include apache2::ssl
 
-	ssl::service { '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,
 	}
@@ -13,5 +20,24 @@ class salsa::web inherits salsa {
 		site    => 'salsa.debian.org',
 		content => template('salsa/apache-salsa.debian.org.conf.erb'),
 	}
-
+	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'),
+	}
 }