branch master updated: hydra: bayfront: Update to new Cuirass configuration.

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 174d1aa  hydra: bayfront: Update to new Cuirass configuration.
174d1aa is described below

commit 174d1aa41a38e37cd0a7d6118b4fdb5a3a474fd3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Feb 4 23:06:16 2021 +0100

    hydra: bayfront: Update to new Cuirass configuration.
    
    * hydra/bayfront.scm (%custom-cuirass): Remove.
    <services>: Add postgresql-service-type, postgresql-role-service-type,
    and avahi-service-type.  Remove customization of cuirass-service-type.
---
 hydra/bayfront.scm | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index 268793c..93782b8 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -3,9 +3,10 @@
 (use-modules (gnu) (guix) (guix packages) (guix git)
              (sysadmin people) (sysadmin services)
              (sysadmin dns) (sysadmin web))
-(use-service-modules admin base certbot cuirass dns networking shepherd web
-                     monitoring ssh)
-(use-package-modules admin certs ci linux ssh tls vim package-management web 
wget)
+(use-service-modules admin avahi base certbot cuirass databases dns
+                     monitoring networking shepherd ssh web)
+(use-package-modules admin certs ci databases linux ssh tls vim
+                     package-management web wget)
 
 (define %sysadmins
   ;; The sysadmins.
@@ -97,14 +98,6 @@
                       "guix-hpc.bordeaux.inria.fr"))
            (deploy-hook %nginx-deploy-hook))))))
 
-(define %custom-cuirass
-  (package
-    (inherit cuirass)
-    (version "dev")
-    (source (git-checkout
-             (commit "cb2c4e3d8f7eda187adf6da1fc35aef838c49828")
-             (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";)
@@ -282,6 +275,15 @@ Happy hacking!\n"))
                    (service certbot-service-type %certbot-configuration)
                    (service goggles-service-type)
 
+                   ;; Cuirass needs PostgreSQL...
+                   (service postgresql-service-type
+                            (postgresql-configuration
+                             (postgresql postgresql-10)))
+                   (service postgresql-role-service-type)
+
+                   ;; ... and Avahi.
+                   (service avahi-service-type)
+
                    (modify-services
                        (frontend-services %sysadmins
                                           #:authorized-keys %build-node-keys
@@ -298,8 +300,4 @@ Happy hacking!\n"))
                      (openssh-service-type
                       config => (openssh-configuration
                                  (inherit config)
-                                 (password-authentication? #f)))
-                     (cuirass-service-type
-                      config => (cuirass-configuration
-                                 (inherit config)
-                                 (cuirass %custom-cuirass)))))))
+                                 (password-authentication? #f)))))))