02/03: nginx: berlin: Allow access to ci.guix as .onion with plain HTTP.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 3be1d427946d45da5cb48e11f46154392b0fe533
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Mar 18 22:33:48 2022 +0100

    nginx: berlin: Allow access to ci.guix as .onion with plain HTTP.
    
    * hydra/nginx/berlin.scm (%ci-onion): New variable.
    (%berlin-servers): Add it among the domains explicitly supporting plain
    HTTP.
---
 hydra/nginx/berlin.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index b99d649..cf03e0e 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -1,5 +1,5 @@
 ;; Nginx configuration for ci.guix.gnu.org
-;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès 
<ludo@gnu.org>
+;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
 ;; Copyright © 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net>
 ;; Copyright © 2020 Christopher Baines <mail@cbaines.net>
 ;; Copyright © 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
@@ -10,7 +10,8 @@
 (use-modules (gnu services web)
              (gnu services version-control)
              (gnu packages monitoring)
-             (sysadmin nginx))
+             (sysadmin nginx)
+             (ice-9 regex))
 
 
 
@@ -138,6 +139,10 @@ Allow: /$\r
                            " =404;")
           "root /;")))))
 
+(define %ci-onion
+  ;; Onion service name of ci.guix.
+  "4zwzi66wwdaalbhgnix55ea3ab4pvvw66ll2ow53kjub6se4q2bclcyd.onion")
+
 (define (berlin-locations publish-url)
   "Return nginx location blocks with 'guix publish' reachable at
 PUBLISH-URL."
@@ -187,9 +192,10 @@ PUBLISH-URL."
    ;; Domains that still explicitly support plain HTTP.
    (nginx-server-configuration
     (listen '("80"))
-    (server-name '("ci.guix.gnu.org"
+    (server-name `("ci.guix.gnu.org"
                   ;; <https://logs.guix.gnu.org/guix/2021-11-20.log#155427>
-                  "~[0-9]$"))
+                  "~[0-9]$"
+                   ,(regexp-quote %ci-onion)))
     (locations (berlin-locations %publish-url))
     (raw-content
      (list