summaryrefslogtreecommitdiffstats
path: root/hosts/jenkins/etc
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/jenkins/etc')
-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/