01/02: hydra: nginx: Add server block for issues.guix.gnu.org.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository maintenance.

commit fc1fc4af83d3e042517921b4d31f1a3699151c06
Author: Ricardo Wurmus <address@hidden>
Date:   Wed May 15 14:12:41 2019 +0200

    hydra: nginx: Add server block for issues.guix.gnu.org.
    
    This is necessary because we registered a separate Let's Encrypt
    certificate instead of expanding the certificate we used for
    issues.guix.info.
    
    * hydra/nginx/berlin.scm (%berlin-servers): Separate server
    configurations for issues.guix.info and issues.guix.gnu.org.
---
 hydra/nginx/berlin.scm | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index b619c85..e6b1545 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -298,8 +298,7 @@
 
    (nginx-server-configuration
     (listen '("443 ssl"))
-    (server-name '("issues.guix.info"
-                   "issues.guix.gnu.org"))
+    (server-name '("issues.guix.info"))
     (ssl-certificate (le "issues.guix.info"))
     (ssl-certificate-key (le "issues.guix.info" 'key))
     (root "/home/rekado/mumi/")
@@ -322,6 +321,29 @@
 
    (nginx-server-configuration
     (listen '("443 ssl"))
+    (server-name '("issues.guix.gnu.org"))
+    (ssl-certificate (le "issues.guix.gnu.org"))
+    (ssl-certificate-key (le "issues.guix.gnu.org" 'key))
+    (root "/home/rekado/mumi/")
+    (locations
+     (list (nginx-location-configuration
+            (uri "/")
+            (body '("proxy_pass http://localhost:1234;";)))))
+    (raw-content
+     (append
+      %tls-settings
+      (list
+       "proxy_set_header X-Forwarded-Host $host;"
+       "proxy_set_header X-Forwarded-Port $server_port;"
+       "proxy_set_header X-Forwarded-For  $proxy_add_x_forwarded_for;"
+       "proxy_connect_timeout       600;"
+       "proxy_send_timeout          600;"
+       "proxy_read_timeout          600;"
+       "send_timeout                600;"
+       "access_log /var/log/nginx/issues-guix-gnu-org.https.access.log;"))))
+
+   (nginx-server-configuration
+    (listen '("443 ssl"))
     (server-name '("workflows.guix.info"
                    "workflow.guix.info"
                    "guixwl.org"