cbaines pushed a commit to branch master in repository maintenance. commit 5ec37f7af8531019268f410603d24c557f8f650c Author: Christopher Baines <m...@cbaines.net> AuthorDate: Mon Apr 20 11:47:47 2020 +0100
hydra: bayfront: Use a custom revision of Cuirass. Make it easier to use a custom Cuirass commit. * hydra/bayfront.scm (%custom-cuirass): New variable. (services): Configure the cuirass-service-type to use the custom cuirass package. --- hydra/bayfront.scm | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm index e1f3d7a..9ee5393 100644 --- a/hydra/bayfront.scm +++ b/hydra/bayfront.scm @@ -1,9 +1,10 @@ ;; OS configuration for bayfront, the frontend of the compile farm. -(use-modules (gnu) (guix) (sysadmin people) (sysadmin services) +(use-modules (gnu) (guix) (guix packages) (guix git) + (sysadmin people) (sysadmin services) (sysadmin dns) (sysadmin web)) -(use-service-modules admin base certbot dns networking shepherd web) -(use-package-modules admin certs linux ssh tls vim package-management web wget) +(use-service-modules admin base certbot cuirass dns networking shepherd web) +(use-package-modules admin certs ci linux ssh tls vim package-management web wget) (define %sysadmins ;; The sysadmins. @@ -73,6 +74,14 @@ "guix-hpc.bordeaux.inria.fr")) (deploy-hook %nginx-deploy-hook)))))) +(define %custom-cuirass + (package + (inherit cuirass) + (version "dev") + (source (git-checkout + (commit "9559fd18d4b89bf797216fbe187f2b26b0a2d165") + (url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git"))))) + (define guix-hpc-web-site (static-web-site-configuration (git-url "https://gitlab.inria.fr/guix-hpc/website.git") @@ -216,12 +225,17 @@ Happy hacking!\n")) (service certbot-service-type %certbot-configuration) - (frontend-services %sysadmins - #:nar-ttl (* 15 24 3600) - #:motd %motd - #:max-jobs 4 - #:cores 6 - #:systems '("x86_64-linux" "armhf-linux") - #:nginx-config-file - (file-append %nginx-config - "/bayfront.conf"))))) + (modify-services + (frontend-services %sysadmins + #:nar-ttl (* 15 24 3600) + #:motd %motd + #:max-jobs 4 + #:cores 6 + #:systems '("x86_64-linux" "armhf-linux") + #:nginx-config-file + (file-append %nginx-config + "/bayfront.conf")) + (cuirass-service-type + config => (cuirass-configuration + (inherit config) + (cuirass %custom-cuirass)))))))