diff options
| author | Parnell Springmeyer <parnell@awakenetworks.com> | 2016-09-01 19:06:21 -0500 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@awakenetworks.com> | 2016-09-01 19:21:06 -0500 |
| commit | 98c058a1ee338731d72d33f320da48c95fecd0e0 (patch) | |
| tree | fe83f2050163abfe9a73ad36ac1368fbe283cd39 /nixos/modules/services/mail | |
| parent | 390ab0b3eff809052d5b9d9b5335413b36898481 (diff) | |
| download | nixpkgs-98c058a1ee338731d72d33f320da48c95fecd0e0.tar nixpkgs-98c058a1ee338731d72d33f320da48c95fecd0e0.tar.gz nixpkgs-98c058a1ee338731d72d33f320da48c95fecd0e0.tar.bz2 nixpkgs-98c058a1ee338731d72d33f320da48c95fecd0e0.tar.lz nixpkgs-98c058a1ee338731d72d33f320da48c95fecd0e0.tar.xz nixpkgs-98c058a1ee338731d72d33f320da48c95fecd0e0.tar.zst nixpkgs-98c058a1ee338731d72d33f320da48c95fecd0e0.zip | |
Adapting everything for the merged permissions wrappers work.
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 | 6 | ||||
| -rw-r--r-- | nixos/modules/services/mail/mail.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index f239dda564a..7848288850a 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/setuid-wrappers/sendmail + sendmail_path = /var/permissions-wrappers/sendmail '' (if isNull cfg.sslServerCert then '' diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index aad497cbc71..6dfb8fdef11 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/setuid-wrappers/exim + exim_path = /var/permissions-wrappers/exim spool_directory = ${cfg.spoolDir} ${cfg.config} ''; @@ -93,11 +93,11 @@ in [ { program = "exim"; source = "${pkgs.exim.out}/bin/exim"; - user = "root"; + owner = "root"; group = "root"; setuid = true; } - ] + ]; systemd.services.exim = { description = "Exim Mail Daemon"; diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix index 63e8d78b5b0..e8b16349f1a 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.setuidOwners = [ config.services.mail.sendmailSetuidWrapper ]; + security.permissionsWrappers.setuid = [ config.services.mail.sendmailSetuidWrapper ]; }; |