From 4c457f61870c4a5c36735a4984914a9718e46bad Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Thu, 5 Jul 2018 12:02:37 +0200 Subject: [PATCH] Add registry.salsa.debian.org vhost config (RT#7316) --- modules/salsa/manifests/web.pp | 5 +++++ .../apache-registry.salsa.debian.org.conf.erb | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 modules/salsa/templates/apache-registry.salsa.debian.org.conf.erb diff --git a/modules/salsa/manifests/web.pp b/modules/salsa/manifests/web.pp index b4a198bcb..212e9bee9 100644 --- a/modules/salsa/manifests/web.pp +++ b/modules/salsa/manifests/web.pp @@ -7,6 +7,7 @@ class salsa::web inherits salsa { ssl::service { [ 'salsa.debian.org', + 'registry.salsa.debian.org', 'signup.salsa.debian.org', 'webhook.salsa.debian.org', 'pages.debian.net', @@ -19,6 +20,10 @@ 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': + site => 'registry.salsa.debian.org', + content => template('salsa/apache-registry.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'), diff --git a/modules/salsa/templates/apache-registry.salsa.debian.org.conf.erb b/modules/salsa/templates/apache-registry.salsa.debian.org.conf.erb new file mode 100644 index 000000000..81473355e --- /dev/null +++ b/modules/salsa/templates/apache-registry.salsa.debian.org.conf.erb @@ -0,0 +1,19 @@ +Use common-debian-service-https-redirect * registry.salsa.debian.org + + + ServerName registry.salsa.debian.org + ServerAdmin debian-admin@lists.debian.org + + Use common-debian-service-ssl registry.salsa.debian.org + Use common-ssl-HSTS + Use http-pkp-registry.salsa.debian.org + + ErrorLog /var/log/apache2/registry.salsa.debian.org-error.log + CustomLog /var/log/apache2/registry.salsa.debian.org-access.log privacy + + ProxyPass / http://127.0.0.1:5000/ retry=15 + ProxyPassReverse / http://127.0.0.1:5000/ + RequestHeader set X-Forwarded-Proto "https" + + +# vim:set syn=apache: -- 2.20.1