diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-28 20:48:03 -0800 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-28 20:48:03 -0800 |
| commit | e92b8402b05f34072a20075ed54660e7a7237cc3 (patch) | |
| tree | 554ae0ff77ff4192a895bab155e5e7116c80f28d /nixos/modules/services/mail | |
| parent | 9de070e620544f9637b20966eec62cbff42988d8 (diff) | |
| download | nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.gz nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.bz2 nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.lz nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.xz nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.tar.zst nixlib-e92b8402b05f34072a20075ed54660e7a7237cc3.zip | |
Addressing PR feedback
Diffstat (limited to 'nixos/modules/services/mail')
| -rw-r--r-- | nixos/modules/services/mail/dovecot.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/exim.nix | 12 | ||||
| -rw-r--r-- | nixos/modules/services/mail/mail.nix | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 6b37a8a4ea2c..7cea2f75439b 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -13,7 +13,7 @@ let '' base_dir = ${baseDir} protocols = ${concatStringsSep " " cfg.protocols} - sendmail_path = /var/permissions-wrappers/sendmail + sendmail_path = /run/wrappers/sendmail '' (if isNull cfg.sslServerCert then '' diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index 6dfb8fdef119..71414bddd5dc 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -70,7 +70,7 @@ in etc."exim.conf".text = '' exim_user = ${cfg.user} exim_group = ${cfg.group} - exim_path = /var/permissions-wrappers/exim + exim_path = /run/wrappers/exim spool_directory = ${cfg.spoolDir} ${cfg.config} ''; @@ -89,15 +89,7 @@ in gid = config.ids.gids.exim; }; - security.permissionsWrappers.setuid = - [ - { program = "exim"; - source = "${pkgs.exim.out}/bin/exim"; - owner = "root"; - group = "root"; - setuid = true; - } - ]; + security.setuidPrograms = [ "exim" ]; systemd.services.exim = { description = "Exim Mail Daemon"; diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix index e8b16349f1a5..aef02eddbe1c 100644 --- a/nixos/modules/services/mail/mail.nix +++ b/nixos/modules/services/mail/mail.nix @@ -26,7 +26,7 @@ with lib; config = mkIf (config.services.mail.sendmailSetuidWrapper != null) { - security.permissionsWrappers.setuid = [ config.services.mail.sendmailSetuidWrapper ]; + security.wrappers.setuid = [ config.services.mail.sendmailSetuidWrapper ]; }; |