From 6bf30a6a93507e87e67b3ec8073ad9a496309bd8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 15 May 2019 14:14:35 +0200 Subject: [PATCH] hydra: nginx: Add server block for guix.gnu.org. This is necessary because we registered a separate Let's Encrypt certificate instead of expanding the certificate we used for guix.info. * hydra/nginx/berlin.scm (%berlin-servers): Separate server configurations for guix.info and guix.gnu.org. --- hydra/nginx/berlin.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm index e6b1545..877c602 100644 --- a/hydra/nginx/berlin.scm +++ b/hydra/nginx/berlin.scm @@ -285,8 +285,7 @@ (nginx-server-configuration (listen '("443 ssl")) (server-name '("guix.info" - "www.guix.info" - "guix.gnu.org")) + "www.guix.info")) (ssl-certificate (le "guix.info")) (ssl-certificate-key (le "guix.info" 'key)) (root "/home/rekado/guix.info") @@ -296,6 +295,18 @@ (list "access_log /var/log/nginx/guix-info.https.access.log;")))) + (nginx-server-configuration + (listen '("443 ssl")) + (server-name '("guix.gnu.org")) + (ssl-certificate (le "guix.gnu.org")) + (ssl-certificate-key (le "guix.gnu.org" 'key)) + (root "/home/rekado/guix.info") + (raw-content + (append + %tls-settings + (list + "access_log /var/log/nginx/guix-gnu-org.https.access.log;")))) + (nginx-server-configuration (listen '("443 ssl")) (server-name '("issues.guix.info"))