guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

08/08: hydra: bayfront: Serve the 10years.guix.gnu.org web site.


From: Ludovic Courtès
Subject: 08/08: hydra: bayfront: Serve the 10years.guix.gnu.org web site.
Date: Mon, 6 Jun 2022 06:07:18 -0400 (EDT)

civodul pushed a commit to branch master
in repository maintenance.

commit 437e42ceae54277206eab75ab1b74c045f9004cd
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Jun 4 10:26:37 2022 +0200

    hydra: bayfront: Serve the 10years.guix.gnu.org web site.
    
    * hydra/bayfront.scm (ten-years-of-guix-web-site)
    (%ten-years-of-guix-nginx-servers): New variables.
    (services): Add instance via 'simple-service' call.
    Add %TEN-YEARS-OF-GUIX-NGINX-SERVERS to 'server-blocks'.
---
 hydra/bayfront.scm | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 5811430..e476985 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -1,5 +1,5 @@
 ;; OS configuration for bayfront
-;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès 
<ludo@gnu.org>
+;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
 ;; Copyright © 2016, 2017, 2018, 2019, 2020 Andreas Enge <andreas@enge.fr>
 ;; Copyright © 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;; Copyright © 2019 Julien Lepiller <julien@lepiller.eu>
@@ -94,6 +94,12 @@
    (git-url "https://gitlab.inria.fr/guix-hpc/website.git";)
    (directory "/srv/guix-hpc-web")))
 
+(define ten-years-of-guix-web-site
+  (static-web-site-configuration
+   (git-url "https://gitlab.com/zimoun/website-guix-10years";)
+   (directory "/srv/ten-years-of-guix")))
+
+
 (define %motd
   (plain-file "motd"
               "\
@@ -409,6 +415,23 @@ access_log   /var/log/nginx/guix-hpc.access.log;"))
              "access_log /var/log/nginx/guix-hpc.access.log;"))
       (locations common-locations)))))
 
+(define %ten-years-of-guix-nginx-servers
+  ;; TODO: Add HTTPS.
+  (list (nginx-server-configuration
+         (server-name '("ten-years.guix.gnu.org"))
+         (listen '("80" "[::]:80"))
+         (raw-content
+          '("
+access_log   /var/log/nginx/ten-years.access.log;
+
+# Limit embedding in HTML frames.
+add_header X-Frame-Options SAMEORIGIN;"))
+         (root "/srv/ten-years-of-guix")
+         (locations
+          (list (nginx-location-configuration     ;for use by Certbot
+                 (uri "/.well-known")
+                 (body '("root /var/www;"))))))))
+
 (define %logs.guix.gnu.org-nginx-servers
   (let ((common-locations
          (list
@@ -903,6 +926,11 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
                     static-web-site-service-type
                     (list guix-hpc-web-site))
 
+    ;; Running 10years.guix.gnu.org.
+    (simple-service 'ten-years-of-guix-web-site
+                    static-web-site-service-type
+                    (list ten-years-of-guix-web-site))
+
     ;; hpcguix-web as it can be seen at
     ;; <https://hpc.guix.info/browse>.
     (service hpcguix-web-service-type
@@ -986,6 +1014,7 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
               (server-blocks
                (append %hpc.guix.info-nginx-servers
                        %guix-hpc.bordeaux.inria.fr-nginx-servers
+                       %ten-years-of-guix-nginx-servers
                        %logs.guix.gnu.org-nginx-servers
                        %bayfront.guix.gnu.org-nginx-servers
                        %bordeaux.guix.gnu.org-nginx-servers



reply via email to

[Prev in Thread] Current Thread [Next in Thread]