From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 5 Dec 2017 22:18:52 +0000 (+0100)
Subject: Put vhost for signup.salsa.debian.org on the salsa host (re: RT#7008)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=181958aa82fb94ef40d4e04e42bd28d97dc38616;p=mirror%2Fdsa-puppet.git

Put vhost for signup.salsa.debian.org on the salsa host (re: RT#7008)
---

diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
index 195e04080..18ebc1461 100644
--- a/modules/salsa/manifests/web.pp
+++ b/modules/salsa/manifests/web.pp
@@ -16,10 +16,12 @@ 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':
+		site    => 'signup.salsa.debian.org',
+		content => template('salsa/apache-signup.salsa.debian.org.conf.erb'),
+	}
 	apache2::site { '010-pages.debian.net':
 		site    => 'pages.debian.net',
 		content => template('salsa/apache-pages.debian.net.conf.erb'),
 	}
-
-
 }
diff --git a/modules/salsa/templates/apache-signup.salsa.debian.org.conf.erb b/modules/salsa/templates/apache-signup.salsa.debian.org.conf.erb
new file mode 100644
index 000000000..134e4aebc
--- /dev/null
+++ b/modules/salsa/templates/apache-signup.salsa.debian.org.conf.erb
@@ -0,0 +1,35 @@
+Use common-debian-service-https-redirect * signup.salsa.debian.org
+
+<VirtualHost *:443>
+	ServerName signup.salsa.debian.org
+	ServerAdmin debian-admin@lists.debian.org
+
+	Use common-debian-service-ssl signup.salsa.debian.org
+	Use common-ssl-HSTS
+	Use http-pkp-signup.salsa.debian.org
+
+	ErrorLog /var/log/apache2/signup.salsa.debian.org-error.log
+	CustomLog /var/log/apache2/signup.salsa.debian.org-access.log privacy
+
+	WSGIDaemonProcess gitlab-self-service user=nobody group=nogroup home=/ threads=5
+	WSGIScriptAlias / /srv/salsa.debian.org/gitlab_newuser/wsgi/gitlab_self_service.wsgi
+
+	Alias /static /srv/salsa.debian.org/gitlab_newuser/src/gitlab_self_service/static
+
+	<Directory /srv/salsa.debian.org/gitlab_newuser/wsgi>
+		<Files gitlab_self_service.wsgi>
+			WSGIProcessGroup gitlab-self-service
+			WSGIApplicationGroup %{GLOBAL}
+			Require all granted
+		</Files>
+	</Directory>
+
+	<Directory /srv/salsa.debian.org/gitlab_newuser/src/gitlab_self_service/static>
+		AllowOverride None
+		# Needed to use libjs-bootstrap from /usr/share/javascript
+		Options FollowSymlinks
+		Require all granted
+	</Directory>
+</VirtualHost>
+
+# vim:set syn=apache: