branch master updated: hydra: services: Remove uses of make-forkexec-constructor/container.

[Christopher Baines]

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

cbaines pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 97a3124  hydra: services: Remove uses of 
make-forkexec-constructor/container.
97a3124 is described below

commit 97a31249793b8af9923f915140a6732539e9d2a3
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Tue May 21 10:48:59 2024 +0100

    hydra: services: Remove uses of make-forkexec-constructor/container.
    
    As this no longer exists, and hasn't existed for quite some time.
    
    I'm switching to directly use make-forkexec-constructor for
    simplicity, but in the future it would be good to switch to using the
    least-authority-wrapper.
    
    * hydra/modules/sysadmin/services.scm (goggles-shepherd-services,
    crash-dump-shepherd-services): Don't use
    make-forkexec-constructor/container.
    * hydra/modules/sysadmin/web.scm (gwl-web-shepherd-service): Don't use
    make-forkexec-constructor/container.
---
 hydra/modules/sysadmin/services.scm | 18 ++++--------------
 hydra/modules/sysadmin/web.scm      |  3 ++-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/hydra/modules/sysadmin/services.scm 
b/hydra/modules/sysadmin/services.scm
index bba7f66..682d9d4 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -778,18 +778,11 @@ to a selected directory.")
            (documentation "Run Goggles, the web interface for IRC logs.")
            (modules '((gnu build shepherd)
                       (gnu system file-systems)))
-           (start #~(make-forkexec-constructor/container
+           ;; TODO Use the least-authority-wrapper here
+           (start #~(make-forkexec-constructor
                      (list #$goggles)
                      #:user "goggles" #:group "goggles"
                      #:log-file "/var/log/goggles.log"
-                     #:mappings (list (file-system-mapping
-                                       (source #$%goggles-cache-directory)
-                                       (target source)
-                                       (writable? #t))
-                                      (file-system-mapping
-                                       (source #$%goggles-irc-log-directory)
-                                       (target source)
-                                       (writable? #f)))
 
                      ;; Run in a UTF-8 locale for proper rendering of the
                      ;; logs.
@@ -986,14 +979,11 @@ to a selected directory.")
            (documentation "Run Crash-dump.")
            (modules '((gnu build shepherd)
                       (gnu system file-systems)))
-           (start #~(make-forkexec-constructor/container
+           ;; TODO Use the least-authority-wrapper here
+           (start #~(make-forkexec-constructor
                      (list #$crash-dump)
                      #:user "crash-dump" #:group "crash-dump"
                      #:log-file "/var/log/crash-dump.log"
-                     #:mappings (list (file-system-mapping
-                                       (source #$%crash-dump-cache-directory)
-                                       (target source)
-                                       (writable? #t)))
                      ;; Run in a UTF-8 locale for proper rendering of the
                      ;; logs.
                      #:environment-variables
diff --git a/hydra/modules/sysadmin/web.scm b/hydra/modules/sysadmin/web.scm
index 1bf3500..b07c080 100644
--- a/hydra/modules/sysadmin/web.scm
+++ b/hydra/modules/sysadmin/web.scm
@@ -358,7 +358,8 @@ taken from a Git repository.")
            (documentation "Run Guix Workflow Language web server.")
            (modules '((gnu build shepherd)
                       (gnu system file-systems)))
-           (start #~(make-forkexec-constructor/container
+           ;; TODO Use the least-authority-wrapper here
+           (start #~(make-forkexec-constructor
                      (list #$wrapped-guix "workflow" "web")
                      #:user "gwl-web"
                      #:group "gwl-web"