01/02: nginx: berlin: Fix "/.i18n" handling.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 246ea2f71cdb5c2f34628d2b7d55c776b161865b
Author: Ludovic Courtès <address@hidden>
Date:   Mon Oct 21 14:57:01 2019 +0200

    nginx: berlin: Fix "/.i18n" handling.
    
    * hydra/nginx/berlin.scm (berlin-locations): Remove "/.well-known"
    location.  Move "/.i18n" and "/guix" locations to...
    (guix.gnu.org-locations): ... here.
---
 hydra/nginx/berlin.scm | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index df90873..72214f8 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -188,22 +188,7 @@ PUBLISH-URL."
            (nginx-location-configuration
             (uri "/berlin.guixsd.org-export.pub")
             (body
-             (list "root /var/www/guix;")))
-
-           ;; Testing the i18n'd web site.
-           (nginx-location-configuration
-            (uri "/.i18n")
-            (body (list "root /srv/guix.gnu.org-i18n;")))
-
-           ;; For use by Certbot.
-           (nginx-location-configuration
-            (uri "/.well-known")
-            (body (list "root /var/www;")))
-
-           ;; For Hurd bootstrap binaries.
-           (nginx-location-configuration
-            (uri "/guix")
-            (body (list "root /var/www;"))))))
+             (list "root /var/www/guix;"))))))
 
 (define guix.gnu.org-locations
   (list
@@ -463,6 +448,16 @@ PUBLISH-URL."
     (uri "~ \\.pdf$")                             ;*.pdf at the top level
     (body (list "root /srv/guix-pdfs;")))
 
+   ;; Testing the i18n'd web site.
+   (nginx-location-configuration
+    (uri "/.i18n")
+    (body (list "alias /srv/guix.gnu.org-i18n;")))
+
+   ;; For Hurd bootstrap binaries.
+   (nginx-location-configuration
+    (uri "/guix")
+    (body (list "root /var/www;")))
+
    (nginx-location-configuration                  ;certbot
     (uri "/.well-known")
     (body (list "root /var/www;")))))