[PATCH 0/2] Add shepherd-requirement field to OpenSMTPD

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • mirai
Owner
unassigned
Submitted by
mirai
Severity
normal
M
M
mirai wrote on 6 Dec 2022 17:50
(address . guix-patches@gnu.org)(address . mirai@makinata.eu)
cover.1670345034.git.mirai@makinata.eu
Replaces the use of 'match-lambda' with 'match-record' and adds
a 'shepherd-requirement' field to opensmtpd-configuration.

Bruno Victal (2):
services: opensmtpd: Use 'match-record' instead of 'match'.
services: opensmtpd: Add shepherd-requirement field.

doc/guix.texi | 5 ++
gnu/services/mail.scm | 120 +++++++++++++++++++++---------------------
2 files changed, 65 insertions(+), 60 deletions(-)


base-commit: b94724e8b2102be0fe9d19e9dfe44d6f7101bd4b
--
2.38.1
M
M
mirai wrote on 6 Dec 2022 17:52
[PATCH 1/2] services: opensmtpd: Use 'match-record' instead of 'match'.
(address . 59860@debbugs.gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)
7d02df3781fe7d6259797598ffe9e36020ad4200.1670345034.git.mirai@makinata.eu
From: Bruno Victal <mirai@makinata.eu>

* gnu/services/mail.scm (opensmtpd-shepherd-service)
(opensmtpd-activation)
(opensmtpd-set-gids): Use 'match-record' instead of 'match'.
---
gnu/services/mail.scm | 117 ++++++++++++++++++++----------------------
1 file changed, 57 insertions(+), 60 deletions(-)

Toggle diff (141 lines)
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 2dc235a585..dc4a7986b6 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -1666,18 +1666,17 @@ (define %default-opensmtpd-config-file
match from local for any action outbound
"))
-(define opensmtpd-shepherd-service
- (match-lambda
- (($ <opensmtpd-configuration> package config-file)
- (list (shepherd-service
- (provision '(smtpd))
- (requirement '(loopback))
- (documentation "Run the OpenSMTPD daemon.")
- (start (let ((smtpd (file-append package "/sbin/smtpd")))
- #~(make-forkexec-constructor
- (list #$smtpd "-f" #$config-file)
- #:pid-file "/var/run/smtpd.pid")))
- (stop #~(make-kill-destructor)))))))
+(define (opensmtpd-shepherd-service config)
+ (match-record config <opensmtpd-configuration> (package config-file)
+ (list (shepherd-service
+ (provision '(smtpd))
+ (requirement '(loopback))
+ (documentation "Run the OpenSMTPD daemon.")
+ (start (let ((smtpd (file-append package "/sbin/smtpd")))
+ #~(make-forkexec-constructor
+ (list #$smtpd "-f" #$config-file)
+ #:pid-file "/var/run/smtpd.pid")))
+ (stop #~(make-kill-destructor))))))
(define %opensmtpd-accounts
(list (user-group
@@ -1698,58 +1697,56 @@ (define %opensmtpd-accounts
(home-directory "/var/empty")
(shell (file-append shadow "/sbin/nologin")))))
-(define opensmtpd-activation
- (match-lambda
- (($ <opensmtpd-configuration> package config-file)
- (let ((smtpd (file-append package "/sbin/smtpd")))
- #~(begin
- (use-modules (guix build utils))
- ;; Create mbox and spool directories.
- (mkdir-p "/var/mail")
- (mkdir-p "/var/spool/smtpd")
- (chmod "/var/spool/smtpd" #o711)
- (mkdir-p "/var/spool/mail")
- (chmod "/var/spool/mail" #o711))))))
+(define (opensmtpd-activation config)
+ (match-record config <opensmtpd-configuration> (package config-file)
+ (let ((smtpd (file-append package "/sbin/smtpd")))
+ #~(begin
+ (use-modules (guix build utils))
+ ;; Create mbox and spool directories.
+ (mkdir-p "/var/mail")
+ (mkdir-p "/var/spool/smtpd")
+ (chmod "/var/spool/smtpd" #o711)
+ (mkdir-p "/var/spool/mail")
+ (chmod "/var/spool/mail" #o711)))))
(define %opensmtpd-pam-services
(list (unix-pam-service "smtpd")))
-(define opensmtpd-set-gids
- (match-lambda
- (($ <opensmtpd-configuration> package config-file set-gids?)
- (if set-gids?
- (list
- (setuid-program
- (program (file-append package "/sbin/smtpctl"))
- (setuid? #false)
- (setgid? #true)
- (group "smtpq"))
- (setuid-program
- (program (file-append package "/sbin/sendmail"))
- (setuid? #false)
- (setgid? #true)
- (group "smtpq"))
- (setuid-program
- (program (file-append package "/sbin/send-mail"))
- (setuid? #false)
- (setgid? #true)
- (group "smtpq"))
- (setuid-program
- (program (file-append package "/sbin/makemap"))
- (setuid? #false)
- (setgid? #true)
- (group "smtpq"))
- (setuid-program
- (program (file-append package "/sbin/mailq"))
- (setuid? #false)
- (setgid? #true)
- (group "smtpq"))
- (setuid-program
- (program (file-append package "/sbin/newaliases"))
- (setuid? #false)
- (setgid? #true)
- (group "smtpq")))
- '()))))
+(define (opensmtpd-set-gids config)
+ (match-record config <opensmtpd-configuration> (package config-file setgid-commands?)
+ (if setgid-commands?
+ (list
+ (setuid-program
+ (program (file-append package "/sbin/smtpctl"))
+ (setuid? #false)
+ (setgid? #true)
+ (group "smtpq"))
+ (setuid-program
+ (program (file-append package "/sbin/sendmail"))
+ (setuid? #false)
+ (setgid? #true)
+ (group "smtpq"))
+ (setuid-program
+ (program (file-append package "/sbin/send-mail"))
+ (setuid? #false)
+ (setgid? #true)
+ (group "smtpq"))
+ (setuid-program
+ (program (file-append package "/sbin/makemap"))
+ (setuid? #false)
+ (setgid? #true)
+ (group "smtpq"))
+ (setuid-program
+ (program (file-append package "/sbin/mailq"))
+ (setuid? #false)
+ (setgid? #true)
+ (group "smtpq"))
+ (setuid-program
+ (program (file-append package "/sbin/newaliases"))
+ (setuid? #false)
+ (setgid? #true)
+ (group "smtpq")))
+ '())))
(define opensmtpd-service-type
(service-type
--
2.38.1
M
M
mirai wrote on 6 Dec 2022 17:52
[PATCH 2/2] services: opensmtpd: Add shepherd-requirement field.
(address . 59860@debbugs.gnu.org)(name . Bruno Victal)(address . mirai@makinata.eu)
29568421ebb18d7a157d817242262ec6f68bb7bb.1670345034.git.mirai@makinata.eu
From: Bruno Victal <mirai@makinata.eu>

---
doc/guix.texi | 5 +++++
gnu/services/mail.scm | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)

Toggle diff (45 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index a79b777826..4cf60d7114 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -25730,6 +25730,11 @@ Data type representing the configuration of opensmtpd.
@item @code{package} (default: @var{opensmtpd})
Package object of the OpenSMTPD SMTP server.
+@item @code{shepherd-requirement} (default: @code{'()})
+This option can be used to provide a list of symbols naming Shepherd services
+that this service will depend on, such as @code{'networking}
+if you want to configure OpenSMTPD to listen on non-loopback interfaces.
+
@item @code{config-file} (default: @code{%default-opensmtpd-config-file})
File-like object of the OpenSMTPD configuration file to use. By default
it listens on the loopback network interface, and allows for mail from
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index dc4a7986b6..6f588679b1 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -1651,6 +1651,8 @@ (define-record-type* <opensmtpd-configuration>
opensmtpd-configuration?
(package opensmtpd-configuration-package
(default opensmtpd))
+ (shepherd-requirement opensmtpd-configuration-shepherd-requirement
+ (default '())) ; list of symbols
(config-file opensmtpd-configuration-config-file
(default %default-opensmtpd-config-file))
(setgid-commands? opensmtpd-setgid-commands? (default #t)))
@@ -1667,10 +1669,11 @@ (define %default-opensmtpd-config-file
"))
(define (opensmtpd-shepherd-service config)
- (match-record config <opensmtpd-configuration> (package config-file)
+ (match-record config <opensmtpd-configuration>
+ (package config-file shepherd-requirement)
(list (shepherd-service
(provision '(smtpd))
- (requirement '(loopback))
+ (requirement `(loopback ,@shepherd-requirement))
(documentation "Run the OpenSMTPD daemon.")
(start (let ((smtpd (file-append package "/sbin/smtpd")))
#~(make-forkexec-constructor
--
2.38.1
L
L
Ludovic Courtès wrote on 26 Dec 2022 00:39
control message for bug #59860
(address . control@debbugs.gnu.org)
875ydzvyrj.fsf@gnu.org
close 59860
quit
?