01/02: hydra: berlin: Remove 'hacked-cuirass-shepherd-service'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit be8cf779d1f49aa40fe70aa65fcfba48a25d172b
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jul 30 15:12:29 2017 +0200

    hydra: berlin: Remove 'hacked-cuirass-shepherd-service'.
    
    * hydra/berlin.scm (hacked-cuirass-shepherd-service)
    (hacked-cuirass-service-type): Remove.
    <packages>: Remove GIT.
    <services>: Use CUIRASS-SERVICE-TYPE.
---
 hydra/berlin.scm | 58 ++------------------------------------------------------
 1 file changed, 2 insertions(+), 56 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 4f32e17..80d9ef8 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -6,60 +6,6 @@
 (use-package-modules admin certs emacs linux ssh tls vim package-management
                      web wget ci version-control)
 
-;; FIXME: This only adds the environment variables GIT_SSL_CAINFO and
-;; GIT_EXEC_PATH, which are needed for cuirass to fetch sources via HTTPS.
-(define (hacked-cuirass-shepherd-service config)
-  "Return a <shepherd-service> for the Cuirass service with CONFIG."
-  (and
-   (cuirass-configuration? config)
-   (let ((cuirass          ((@@ (gnu services cuirass) 
cuirass-configuration-cuirass) config))
-         (cache-directory  ((@@ (gnu services cuirass) 
cuirass-configuration-cache-directory) config))
-         (log-file         ((@@ (gnu services cuirass) 
cuirass-configuration-log-file) config))
-         (user             ((@@ (gnu services cuirass) 
cuirass-configuration-user) config))
-         (group            ((@@ (gnu services cuirass) 
cuirass-configuration-group) config))
-         (interval         ((@@ (gnu services cuirass) 
cuirass-configuration-interval) config))
-         (database         ((@@ (gnu services cuirass) 
cuirass-configuration-database) config))
-         (port             ((@@ (gnu services cuirass) 
cuirass-configuration-port) config))
-         (specs            ((@@ (gnu services cuirass) 
cuirass-configuration-specifications) config))
-         (use-substitutes? ((@@ (gnu services cuirass) 
cuirass-configuration-use-substitutes?) config))
-         (one-shot?        ((@@ (gnu services cuirass) 
cuirass-configuration-one-shot?) config))
-         (load-path        ((@@ (gnu services cuirass) 
cuirass-configuration-load-path) config)))
-     (list (shepherd-service
-            (documentation "Run Cuirass.")
-            (provision '(cuirass))
-            (requirement '(guix-daemon networking))
-            (start #~(make-forkexec-constructor
-                      (list (string-append #$cuirass "/bin/cuirass")
-                            "--cache-directory" #$cache-directory
-                            "--specifications"
-                            #$(scheme-file "cuirass-specs.scm" specs)
-                            "--database" #$database
-                            "--port" #$(number->string port)
-                            "--interval" #$(number->string interval)
-                            #$@(if use-substitutes? '("--use-substitutes") '())
-                            #$@(if one-shot? '("--one-shot") '())
-                            #$@(if (null? load-path) '()
-                                   `("--load-path" ,(string-join load-path 
":"))))
-                      #:environment-variables
-                      (list 
"GIT_SSL_CAINFO=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt"
-                            
"GIT_EXEC_PATH=/run/current-system/profile/libexec/git-core/")
-                      #:user #$user
-                      #:group #$group
-                      #:log-file #$log-file))
-            (stop #~(make-kill-destructor)))))))
-
-(define hacked-cuirass-service-type
-  (service-type
-   (name 'cuirass)
-   (extensions
-    (list
-     (service-extension profile-service-type      ;for 'info cuirass'
-                        (compose list (@@ (gnu services cuirass) 
cuirass-configuration-cuirass)))
-     (service-extension rottlog-service-type (@@ (gnu services cuirass) 
cuirass-log-rotations))
-     (service-extension activation-service-type (@@ (gnu services cuirass) 
cuirass-activation))
-     (service-extension shepherd-root-service-type 
hacked-cuirass-shepherd-service)
-     (service-extension account-service-type (@@ (gnu services cuirass) 
cuirass-account))))))
-
 (define %sysadmins
   ;; The sysadmins.
   (list (sysadmin (name "ludo")
@@ -277,7 +223,7 @@ Happy hacking!\n"))
                    jnettop lm-sensors openssh
                    ;; This is needed to set GIT_SSL_CAINFO allowing
                    ;; Cuirass to fetch sources via HTTPS.
-                   git nss-certs
+                   nss-certs
                    %base-packages))
 
   (services (cons*
@@ -311,7 +257,7 @@ Happy hacking!\n"))
              %nginx-mime-types
              %nginx-cache-activation
 
-             (service hacked-cuirass-service-type
+             (service cuirass-service-type
                       (cuirass-configuration
                        (interval (* 5 60))
                        (specifications %cuirass-specs)))