[Qa-jenkins-scm] [jenkins.debian.net] 01/01: Revert "apache: merge the common-directives-ssl macro into the common-directives macro"

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit c9beec2152f1657d65be4505f59880a2ae9210d7
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Apr 6 16:12:10 2018 +0200

    Revert "apache: merge the common-directives-ssl macro into the common-directives macro"
    
    This reverts commit 51fd543e70d9563ea6629d8d274819cac286fad4.
---
 .../etc/apache2/sites-available/jenkins.debian.net.conf  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
index 572ea68..6b2eded 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -6,6 +6,12 @@
 	</VirtualHost>
 </Macro>
 
+<Macro common-directives-ssl $name>
+	SSLEngine on
+	SSLCertificateKeyFile /etc/apache2/ssl/$name.key
+	SSLCertificateFile /etc/apache2/ssl/$name.pem
+</Macro>
+
 <Macro common-directives $name>
 	ServerName $name
 	ServerAdmin holger at layer-acht.org
@@ -38,10 +44,7 @@
 	RewriteEngine on
 	ProxyRequests Off
 
-	# SSL
-	SSLEngine on
-	SSLCertificateKeyFile /etc/apache2/ssl/$name.key
-	SSLCertificateFile /etc/apache2/ssl/$name.pem
+	# HSTS
 	Header always add Strict-Transport-Security "max-age=15552000"
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -59,6 +62,7 @@ Use https-redirect www.reproducible-builds.org
 
 <VirtualHost *:443>
 	Use common-directives jenkins.debian.net
+	Use common-directives-ssl jenkins.debian.net
 
 	DocumentRoot /var/www
 	AddDefaultCharset utf-8
@@ -123,6 +127,7 @@ Use https-redirect www.reproducible-builds.org
 
 <VirtualHost *:443>
 	Use common-directives reproducible.debian.net
+	Use common-directives-ssl reproducible.debian.net
 
 	# just redirect everything to the new hostname
 	Redirect permanent / https://tests.reproducible-builds.org/
@@ -130,6 +135,7 @@ Use https-redirect www.reproducible-builds.org
 
 <VirtualHost *:443>
 	Use common-directives tests.reproducible-builds.org
+	Use common-directives-ssl reproducible.debian.net
 
 	DocumentRoot /var/lib/jenkins/userContent/reproducible
 	AddDefaultCharset utf-8
@@ -308,6 +314,7 @@ Use https-redirect www.reproducible-builds.org
 
 <VirtualHost *:443>
 	Use common-directives reproducible-builds.org
+	Use common-directives-ssl reproducible-builds.org
 
 	DocumentRoot /srv/reproducible-builds.org/www
 	AddDefaultCharset utf-8
@@ -331,6 +338,7 @@ Use https-redirect www.reproducible-builds.org
 
 <VirtualHost *:443>
 	Use common-directives www.reproducible-builds.org
+	Use common-directives-ssl reproducible-builds.org
 
 	# just redirect everything to non-www
 	Redirect permanent / https://reproducible-builds.org/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git