diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2024-08-18 02:00:00 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2024-08-18 02:00:00 +0200 |
| commit | 79833cdbc6832f1fc7d6b3c85afc824c5fc21be4 (patch) | |
| tree | 65a51931d366728c1b20ec6f2ffc3a7c4998303c /gnu/services | |
| parent | 83338f5a72c80eb7bb75d4e3f31266318bb4d4a3 (diff) | |
| download | guix-79833cdbc6832f1fc7d6b3c85afc824c5fc21be4.tar.gz guix-79833cdbc6832f1fc7d6b3c85afc824c5fc21be4.zip | |
services: Migrate opensmtpd to (gnu system privilege).
* gnu/services/mail.scm (opensmtpd-set-gids): Migrate to
PRIVILEGED-PROGRAM from SETUID-PROGRAM…
(opensmtpd-service-type): … and to PRIVILEGED-PROGRAM-SERVICE-TYPE
from SETUID-PROGRAM-SERVICE-TYPE.
Change-Id: Ide434aa480ea3316c971c58898088d72b5b6671f
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/mail.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 9b4bfd360f..dd0fa59a69 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> -;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2020, 2024 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Kristofer Buffington <kristoferbuffington@gmail.com> ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2023 Thomas Ieong <th.ieong@free.fr> @@ -32,8 +32,8 @@ #:use-module (gnu services configuration) #:use-module (gnu services shepherd) #:use-module (gnu system pam) + #:use-module (gnu system privilege) #:use-module (gnu system shadow) - #:use-module (gnu system setuid) #:use-module (gnu packages mail) #:use-module (gnu packages admin) #:use-module (gnu packages dav) @@ -1744,32 +1744,32 @@ match from local for any action outbound (match-record config <opensmtpd-configuration> (package config-file setgid-commands?) (if setgid-commands? (list - (setuid-program + (privileged-program (program (file-append package "/sbin/smtpctl")) (setuid? #false) (setgid? #true) (group "smtpq")) - (setuid-program + (privileged-program (program (file-append package "/sbin/sendmail")) (setuid? #false) (setgid? #true) (group "smtpq")) - (setuid-program + (privileged-program (program (file-append package "/sbin/send-mail")) (setuid? #false) (setgid? #true) (group "smtpq")) - (setuid-program + (privileged-program (program (file-append package "/sbin/makemap")) (setuid? #false) (setgid? #true) (group "smtpq")) - (setuid-program + (privileged-program (program (file-append package "/sbin/mailq")) (setuid? #false) (setgid? #true) (group "smtpq")) - (setuid-program + (privileged-program (program (file-append package "/sbin/newaliases")) (setuid? #false) (setgid? #true) @@ -1790,7 +1790,7 @@ match from local for any action outbound (compose list opensmtpd-configuration-package)) (service-extension shepherd-root-service-type opensmtpd-shepherd-service) - (service-extension setuid-program-service-type + (service-extension privileged-program-service-type opensmtpd-set-gids))) (description "Run the OpenSMTPD, a lightweight @acronym{SMTP, Simple Mail Transfer Protocol} server."))) |