[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: berlin: Build and publish the "wip-i18n" branch of the web site.
From: |
Ludovic Courtès |
Subject: |
02/03: berlin: Build and publish the "wip-i18n" branch of the web site. |
Date: |
Thu, 26 Sep 2019 04:42:48 -0400 (EDT) |
civodul pushed a commit to branch master
in repository maintenance.
commit e86c686b607a0f772ae004db021181607ba805ee
Author: Ludovic Courtès <address@hidden>
Date: Wed Sep 25 19:54:15 2019 +0200
berlin: Build and publish the "wip-i18n" branch of the web site.
* hydra/berlin.scm (services): Add 'static-web-site-service-type'
instance for the "wip-i18n" branch.
* hydra/nginx/berlin.scm (berlin-locations): Add "/.i18n" location.
---
hydra/berlin.scm | 13 ++++++++++++-
hydra/nginx/berlin.scm | 5 +++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index c273305..21a87bc 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -207,7 +207,6 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
(service nginx-service-type %nginx-configuration)
;; Runnning guix.gnu.org.
-
(service static-web-site-service-type
(static-web-site-configuration
(git-url
@@ -215,6 +214,18 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
(directory "/srv/guix.gnu.org")
(build-file "website/.guix.scm")))
+ ;; 'wip-i18n' branch of guix.gnu.org.
+ (service static-web-site-service-type
+ (static-web-site-configuration
+ (git-url
+
"https://git.savannah.gnu.org/git/guix/guix-artwork.git")
+ (git-ref '(branch . "wip-i18n"))
+ (directory "/srv/guix.gnu.org-i18n")
+ (build-file "website/.guix.scm")
+ (cache-directory "guix.gnu.org-i18n") ;avoid collision
+ (environment-variables
+ '(("GUIX_WEB_SITE_ROOT_PATH" . "/.i18n")))))
+
;; Manual for the latest stable release.
(service static-web-site-service-type
(static-web-site-configuration
diff --git a/hydra/nginx/berlin.scm b/hydra/nginx/berlin.scm
index c516686..df90873 100644
--- a/hydra/nginx/berlin.scm
+++ b/hydra/nginx/berlin.scm
@@ -190,6 +190,11 @@ PUBLISH-URL."
(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")