From: Julien Cristau <jcristau@debian.org>
Date: Mon, 9 Jul 2018 18:06:59 +0000 (+0200)
Subject: Make salsa.d.o the default ssl vhost on godard so lame clients can get to it
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=b5d835a109dfa67aa6c10a984f068252787c4065

Make salsa.d.o the default ssl vhost on godard so lame clients can get to it

Apparently bzr still doesn't do SNI
(https://salsa.debian.org/salsa/support/issues/90)
---

diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
index 212e9bee9..ca238672d 100644
--- a/modules/salsa/manifests/web.pp
+++ b/modules/salsa/manifests/web.pp
@@ -20,19 +20,23 @@ 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':
+	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':
+	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'),
 	}