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/scheduling | |
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/scheduling')
-rw-r--r-- | nixos/modules/services/scheduling/atd.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/scheduling/cron.nix | 6 | ||||
-rw-r--r-- | nixos/modules/services/scheduling/fcron.nix | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 2070b2ffa01..9c4f8d59faa 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -42,8 +42,10 @@ in config = mkIf cfg.enable { - security.setuidOwners = map (program: { + security.permissionsWrappers.setuid = map (program: { inherit program; + + source = "${pkgs.atd}/bin/${program}"; owner = "atd"; group = "atd"; setuid = true; diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 541fbb7ee64..e33961658f0 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -20,7 +20,7 @@ let cronNixosPkg = pkgs.cron.override { # The mail.nix nixos module, if there is any local mail system enabled, # should have sendmail in this path. - sendmailPath = "/var/setuid-wrappers/sendmail"; + sendmailPath = "/var/permissions-wrappers/sendmail"; }; allFiles = @@ -61,7 +61,7 @@ in A list of Cron jobs to be appended to the system-wide crontab. See the manual page for crontab for the expected format. If you want to get the results mailed you must setuid - sendmail. See <option>security.setuidOwners</option> + sendmail. See <option>security.permissionsWrappers.setuid</option> If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root will is allowed to have its own crontab file. The /var/cron/cron.deny file @@ -99,7 +99,7 @@ in [ { program = "crontab"; source = "${pkgs.cronNixosPkg.out}/bin/crontab"; - user = "root"; + owner = "root"; group = "root"; setuid = true; } diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 6e8465ab08f..5804f0ee72f 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -96,7 +96,7 @@ in fcronallow = /etc/fcron.allow fcrondeny = /etc/fcron.deny shell = /bin/sh - sendmail = /var/setuid-wrappers/sendmail + sendmail = /var/permissions-wrappers/sendmail editor = /run/current-system/sw/bin/vi ''; target = "fcron.conf"; @@ -110,7 +110,7 @@ in [ { program = "fcrontab"; source = "${pkgs.fcron.out}/bin/fcrontab"; - user = "root"; + owner = "root"; group = "root"; setuid = true; } |