From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 5 Jan 2018 16:55:51 +0000 (+0100)
Subject: Add webhook things for Ganneff based on his patch
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c33dfb62ca19f76e961de79af216905b75d98394;p=mirror%2Fdsa-puppet.git

Add webhook things for Ganneff based on his patch
---

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index b7c8b0375..dbcaaf649 100644
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -66,6 +66,9 @@ class salsa inherits salsa::params {
 	file { "/var/lib/systemd/linger/git":
 		ensure => present,
 	}
+	file { "/var/lib/systemd/linger/salsa-webhook":
+		ensure => present,
+	}
 	file { "/etc/ssh/userkeys/git":
 		ensure => link,
 		target => "${salsa::home}/.ssh/authorized_keys",
diff --git a/modules/salsa/manifests/packages.pp b/modules/salsa/manifests/packages.pp
index 9fa4e6fd3..431225664 100644
--- a/modules/salsa/manifests/packages.pp
+++ b/modules/salsa/manifests/packages.pp
@@ -30,6 +30,9 @@ class salsa::packages inherits salsa {
 		'ruby-dev',
 		'ruby-sinatra',
 		'ruby-sinatra-contrib',
+		'ruby-mail',
+		'ruby-soap4r',
+		'thin',
 		'libpq-dev',
 		'zlib1g-dev'
 	]
diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp
index 18ebc1461..43489fb73 100644
--- a/modules/salsa/manifests/web.pp
+++ b/modules/salsa/manifests/web.pp
@@ -5,9 +5,11 @@ 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',
+		'signup.salsa.debian.org',
+		'webhook.salsa.debian.org',
+		]:
 		notify  => Exec['service apache2 reload'],
 		key => true,
 	}
@@ -20,6 +22,10 @@ class salsa::web inherits salsa {
 		site    => 'signup.salsa.debian.org',
 		content => template('salsa/apache-signup.salsa.debian.org.conf.erb'),
 	}
+	apache2::site { '010-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':
 		site    => 'pages.debian.net',
 		content => template('salsa/apache-pages.debian.net.conf.erb'),
diff --git a/modules/salsa/templates/apache-webhook.salsa.debian.org.conf.erb b/modules/salsa/templates/apache-webhook.salsa.debian.org.conf.erb
new file mode 100644
index 000000000..d806e5054
--- /dev/null
+++ b/modules/salsa/templates/apache-webhook.salsa.debian.org.conf.erb
@@ -0,0 +1,21 @@
+Use common-debian-service-https-redirect * webhook.salsa.debian.org
+
+<VirtualHost *:443>
+	ServerName webhook.salsa.debian.org
+	ServerAdmin debian-admin@lists.debian.org
+
+	Use common-debian-service-ssl webhook.salsa.debian.org
+	Use common-ssl-HSTS
+	Use http-pkp-webhook.salsa.debian.org
+
+	ErrorLog /var/log/apache2/webhook.salsa.debian.org-error.log
+	CustomLog /var/log/apache2/webhook.salsa.debian.org-access.log privacy
+
+	ProxyPreserveHost On
+	AllowEncodedSlashes NoDecode
+
+	ProxyPass / http://127.0.0.1:7443/ retry=15 nocanon
+	ProxyPassReverse http://127.0.0.1:7443/
+</VirtualHost>
+
+# vim:set syn=apache: