From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 6 Sep 2017 21:10:48 +0000 (+0000)
Subject: deploy a basic apache config for salsa
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9e1f74ad62a130347719115d4248d0dc1170d0c2;p=mirror%2Fdsa-puppet.git

deploy a basic apache config for salsa
---

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index 7a992ea7b..519fdaee4 100644
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -7,6 +7,7 @@ class salsa inherits salsa::params {
 	class { '::salsa::redis': } ->
 	class { '::salsa::packages': } ->
 	class { '::salsa::database': } ->
+	class { '::salsa::web': } ->
 	anchor { 'salsa::end': }
 
 	# userdir-ldap users get their home in /home
@@ -54,9 +55,4 @@ class salsa inherits salsa::params {
 	file { "/var/lib/systemd/linger/git":
 		ensure => present,
 	}
-
-	ssl::service { $servicename:
-		# notify  => Exec['service apache2 reload'],
-		key => true,
-	}
 }
diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
new file mode 100644
index 000000000..a597a5ce4
--- /dev/null
+++ b/modules/salsa/manifests/web.pp
@@ -0,0 +1,17 @@
+#
+class salsa::web inherits salsa {
+	include apache2
+	include apache2::proxy_http
+	include apache2::ssl
+
+	ssl::service { 'salsa.debian.org':
+		notify  => Exec['service apache2 reload'],
+		key => true,
+	}
+
+	apache2::site { '010-salsa.debian.org':
+		site    => 'salsa.debian.org',
+		content => template('salsa/apache-salsa.debian.org.conf.erb'),
+	}
+
+}
diff --git a/modules/salsa/templates/apache-salsa.debian.org.conf.erb b/modules/salsa/templates/apache-salsa.debian.org.conf.erb
new file mode 100644
index 000000000..d6e9a96cf
--- /dev/null
+++ b/modules/salsa/templates/apache-salsa.debian.org.conf.erb
@@ -0,0 +1,18 @@
+Use common-debian-service-https-redirect * salsa.debian.org
+
+<VirtualHost *:443>
+	ServerName salsa.debian.org
+	ServerAdmin debian-admin@lists.debian.org
+
+	Use common-debian-service-ssl salsa.debian.org
+	Use common-ssl-HSTS
+	Use http-pkp-salsa.debian.org
+
+	ErrorLog /var/log/apache2/salsa.debian.org-error.log
+	CustomLog /var/log/apache2/salsa.debian.org-access.log privacy
+
+	ProxyPass / http://127.0.0.1:8080/ retry=15
+	ProxyPassReverse / http://127.0.0.1:8080/
+</VirtualHost>
+
+# vim:set syn=apache: