1 files changed, 44 insertions, 23 deletions

diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 18b482272c..7ba95a8241 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -7,6 +7,9 @@
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr>
 ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi>
+;;; Copyright © 2023, 2024 Wojtek Kosior <koszko@koszko.org>
+;;; Additions and modifications by Wojtek Kosior are additionally
+;;; dual-licensed under the Creative Commons Zero v1.0.
 ;;; Copyright © 2024 Juliana Sims <juli@incana.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1813,10 +1816,14 @@ database---computed from the given alias list.")))
 (define-record-type* <exim-configuration> exim-configuration
   make-exim-configuration
   exim-configuration?
-  (package       exim-configuration-package ;file-like
-                 (default exim))
-  (config-file   exim-configuration-config-file ;file-like
-                 (default #f)))
+  (package        exim-configuration-package ;file-like
+                  (default exim))
+  (config-file    exim-configuration-config-file ;file-like
+                  (default #f))
+  (setuid-user    exim-configuration-setuid-user
+                  (default #f))
+  (setgid-group   exim-configuration-setgid-group
+                  (default #f)))
 
 (define %exim-accounts
   (list (user-group
@@ -1830,17 +1837,6 @@ database---computed from the given alias list.")))
          (home-directory "/var/empty")
          (shell (file-append shadow "/sbin/nologin")))))
 
-(define (exim-computed-config-file package config-file)
-  (computed-file "exim.conf"
-                 #~(call-with-output-file #$output
-                     (lambda (port)
-                       (format port "
-exim_user = exim
-exim_group = exim
-.include ~a"
-                               #$(or config-file
-                                     (file-append package "/etc/exim.conf")))))))
-
 (define exim-shepherd-service
   (match-lambda
     (($ <exim-configuration> package config-file)
@@ -1849,29 +1845,53 @@ exim_group = exim
             (documentation "Run the exim daemon.")
             (requirement '(networking))
             (start #~(make-forkexec-constructor
-                      '(#$(file-append package "/bin/exim")
-                        "-bd" "-v" "-C"
-                        #$(exim-computed-config-file package config-file))))
+                      '(#$(file-append package "/bin/exim") "-bd" "-v")))
             (stop #~(make-kill-destructor)))))))
 
 (define exim-activation
   (match-lambda
-    (($ <exim-configuration> package config-file)
+    (($ <exim-configuration> package config-file setuid-user setgid-group)
      (with-imported-modules '((guix build utils))
        #~(begin
-           (use-modules (guix build utils))
+           (use-modules (guix build utils)
+                        (ice-9 format))
 
            (let ((uid (passwd:uid (getpw "exim")))
                  (gid (group:gid (getgr "exim"))))
              (mkdir-p "/var/spool/exim")
              (chown "/var/spool/exim" uid gid))
 
-           (zero? (system* #$(file-append package "/bin/exim")
-                           "-bV" "-C" #$(exim-computed-config-file package config-file))))))))
+           ;; Exim often rereads its config file.  Let's substitute it
+           ;; atomically.
+           (with-output-to-file "/etc/exim.conf.new"
+             (lambda _
+               (format #t "
+~:[~;exim_path = /run/setuid-programs/exim~%~]
+.include ~a"
+                       (or #$setuid-user #$setgid-group)
+                       #$(or config-file
+                             (file-append package "/etc/exim.conf")))))
+
+           (chmod "/etc/exim.conf.new" #o444)
+           (rename-file "/etc/exim.conf.new" "/etc/exim.conf")
+
+           (zero? (system* #$(file-append package "/bin/exim") "-bV")))))))
 
 (define exim-profile
   (compose list exim-configuration-package))
 
+(define exim-setuids
+  (match-lambda
+    (($ <exim-configuration> package config-file setuid-user setgid-group)
+     (if (or setuid-user setgid-group)
+         (list (setuid-program
+                (program (file-append package "/bin/exim"))
+                (setuid? #t)
+                (user (or setuid-user "exim"))
+                (setgid? (not (not setgid-group)))
+                (group (or setgid-group 0))))
+         '()))))
+
 (define exim-service-type
   (service-type
    (name 'exim)
@@ -1880,7 +1900,8 @@ exim_group = exim
           (service-extension account-service-type (const %exim-accounts))
           (service-extension activation-service-type exim-activation)
           (service-extension profile-service-type exim-profile)
-          (service-extension mail-aliases-service-type (const '()))))
+          (service-extension mail-aliases-service-type (const '()))
+          (service-extension setuid-program-service-type exim-setuids)))
    (description "Run the Exim mail transfer agent (MTA).")))
 
 

path: root/etc/gnu-store.mount.in

[Unit]
Description=Read-only @storedir@ for GNU Guix
DefaultDependencies=no
ConditionPathExists=@storedir@
Before=guix-daemon.service

[Install]
WantedBy=guix-daemon.service

[Mount]
What=@storedir@
Where=@storedir@
Type=none
Options=bind,ro