[Qa-jenkins-scm] [jenkins.debian.net] 01/01: switch to letsencrypt certs, thanks to globalsign.com for providing ssl certs for the last 12 months

[Holger Levsen]

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

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

commit 63df0f115470eaba72bb0bd69be927709d11094c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jan 11 13:47:59 2016 +0100

    switch to letsencrypt certs, thanks to globalsign.com for providing ssl certs for the last 12 months
---
 THANKS.head                                            |  6 +++++-
 .../apache2/sites-available/jenkins.debian.net.conf    | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/THANKS.head b/THANKS.head
index 3bb40e8..bcfc929 100644
--- a/THANKS.head
+++ b/THANKS.head
@@ -11,11 +11,15 @@
  ** 17 cores and 48 GB memory for profitbricks-build5-amd64.debian.net
  ** 17 cores and 48 GB memory for profitbricks-build6-amd64.debian.net
  ** 3 cores and 6 GB memory for freebsd-jenkins.debian.net (also running on Profitbricks virtual hardware)
- * link:https://globalsign.com[GlobalSign] in January 2015 kindly provided free of charge SSL certificates for both jenkins.debian.net and reproducible.debian.net.
  * link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] is kindly providing and hosting 13 'armhf' systems:
  ** eight quad-cores with 2 GB RAM each,
  ** two quad-cores with 1 GB RAM and
  ** three dual-cores with 1 GB RAM.
+ * link:https://letsencrypt.org[Let's encrypt] kindly provides free of charge SSL certificates for both jenkins.debian.net and reproducible.debian.net.
+
+==== Past sponsors
+
+ * link:https://globalsign.com[GlobalSign] from January 2015 to January 2016 kindly provided free of charge SSL certificates for both jenkins.debian.net and reproducible.debian.net.
 
 === Contributors
 
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 5a0e1c2..b325a29 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 at 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

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