[Qa-jenkins-scm] [jenkins.debian.net] 08/08: 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 51fd543e70d9563ea6629d8d274819cac286fad4
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Apr 6 16:04:15 2018 +0200

    apache: merge the common-directives-ssl macro into the common-directives macro
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 .../etc/apache2/sites-available/jenkins.debian.net.conf  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 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 6b2eded..572ea68 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -6,12 +6,6 @@
 	</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
@@ -44,7 +38,10 @@
 	RewriteEngine on
 	ProxyRequests Off
 
-	# HSTS
+	# SSL
+	SSLEngine on
+	SSLCertificateKeyFile /etc/apache2/ssl/$name.key
+	SSLCertificateFile /etc/apache2/ssl/$name.pem
 	Header always add Strict-Transport-Security "max-age=15552000"
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -62,7 +59,6 @@ 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
@@ -127,7 +123,6 @@ 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/
@@ -135,7 +130,6 @@ 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
@@ -314,7 +308,6 @@ 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
@@ -338,7 +331,6 @@ 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