summaryrefslogtreecommitdiffstats
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf18
1 files changed, 14 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 5a0e1c24..b325a291 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -33,10 +33,17 @@ NameVirtualHost *:443
</VirtualHost>
</Macro>
-<Macro common-directives $name $chainfile>
+<Macro common-directives-ssl-chain $chainfile>
SSLEngine on
SSLCertificateChainFile /etc/apache2/ssl/$chainfile
+</Macro>
+
+<Macro common-directives-ssl-key $keyfile>
+ SSLEngine on
+ SSLCertificateKeyFile /etc/apache2/ssl/$keyfile
+</Macro>
+<Macro common-directives $name>
ServerName $name
ServerAdmin holger@layer-acht.org
@@ -93,7 +100,8 @@ Use common-debian-service-https-redirect reproducible.debian.net
Use common-debian-service-https-redirect reproducible-builds.org
<VirtualHost *:443>
- Use common-directives jenkins.debian.net gsdomainvalsha2g2r1.crt
+ Use common-directives jenkins.debian.net
+ Use common-directives-ssl-key jenkins.debian.net.key
SSLCertificateFile /etc/apache2/ssl/jenkins.debian.net.pem
DocumentRoot /var/www
@@ -157,7 +165,8 @@ Use common-debian-service-https-redirect reproducible-builds.org
<VirtualHost *:443>
- Use common-directives reproducible.debian.net gsdomainvalsha2g2r1.crt
+ Use common-directives reproducible.debian.net
+ Use common-directives-ssl-key reproducible.debian.net.key
SSLCertificateFile /etc/apache2/ssl/reproducible.debian.net.pem
DocumentRoot /var/lib/jenkins/userContent/reproducible
@@ -322,7 +331,8 @@ Use common-debian-service-https-redirect reproducible-builds.org
</VirtualHost>
<VirtualHost *:443>
- Use common-directives reproducible-builds.org startcom.crt
+ Use common-directives reproducible-builds.org
+ Use common-directives-ssl-chain startcom.crt
SSLCertificateFile /etc/apache2/ssl/reproducible-builds.org.pem
DocumentRoot /srv/reproducible-builds.org/www