summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins/etc/apache2
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@debian.org>2017-06-15 18:33:42 +0200
committerHolger Levsen <holger@layer-acht.org>2017-06-16 16:28:34 +0200
commit965bef0b3e639d9c71512e8008538816ce002a01 (patch)
treefbe3363204005ee4ff85caf6e31750255577510d /hosts/jenkins/etc/apache2
parentf47de0632df9926589d2a0fbe497c047d0269c22 (diff)
downloadjenkins.debian.net-965bef0b3e639d9c71512e8008538816ce002a01.tar.xz
apache: deduplicate SSLCertificateFile directive into the common-directives-ssl macro
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
Diffstat (limited to 'hosts/jenkins/etc/apache2')
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf20
1 files changed, 8 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 e9b0fd73..bb3aef96 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -33,9 +33,10 @@ NameVirtualHost *:443
</VirtualHost>
</Macro>
-<Macro common-directives-ssl-key $keyfile>
+<Macro common-directives-ssl $name>
SSLEngine on
- SSLCertificateKeyFile /etc/apache2/ssl/$keyfile
+ SSLCertificateKeyFile /etc/apache2/ssl/$name.key
+ SSLCertificateFile /etc/apache2/ssl/$name.pem
</Macro>
<Macro common-directives $name>
@@ -98,8 +99,7 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
<VirtualHost *:443>
Use common-directives jenkins.debian.net
- Use common-directives-ssl-key jenkins.debian.net.key
- SSLCertificateFile /etc/apache2/ssl/jenkins.debian.net.pem
+ Use common-directives-ssl jenkins.debian.net
DocumentRoot /var/www
AddDefaultCharset utf-8
@@ -161,8 +161,7 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
<VirtualHost *:443>
Use common-directives reproducible.debian.net
- Use common-directives-ssl-key reproducible.debian.net.key
- SSLCertificateFile /etc/apache2/ssl/reproducible.debian.net.pem
+ Use common-directives-ssl reproducible.debian.net
# just redirect everything to the new hostname
Redirect permanent / https://tests.reproducible-builds.org/
@@ -170,8 +169,7 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
<VirtualHost *:443>
Use common-directives tests.reproducible-builds.org
- Use common-directives-ssl-key reproducible.debian.net.key
- SSLCertificateFile /etc/apache2/ssl/reproducible.debian.net.pem
+ Use common-directives-ssl reproducible.debian.net
DocumentRoot /var/lib/jenkins/userContent/reproducible
AddDefaultCharset utf-8
@@ -342,8 +340,7 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
<VirtualHost *:443>
Use common-directives reproducible-builds.org
- Use common-directives-ssl-key reproducible-builds.org.key
- SSLCertificateFile /etc/apache2/ssl/reproducible-builds.org.pem
+ Use common-directives-ssl reproducible-builds.org
DocumentRoot /srv/reproducible-builds.org/www
AddDefaultCharset utf-8
@@ -367,8 +364,7 @@ Use common-debian-service-https-redirect www.reproducible-builds.org
<VirtualHost *:443>
Use common-directives www.reproducible-builds.org
- Use common-directives-ssl-key reproducible-builds.org.key
- SSLCertificateFile /etc/apache2/ssl/reproducible-builds.org.pem
+ Use common-directives-ssl reproducible-builds.org
# just redirect everything to non-www
Redirect permanent / https://reproducible-builds.org/