diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 05:33:56 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 05:33:56 -0600 |
| commit | 628e6a83d0f3b7ddc0592c88fef7978a7ee0063e (patch) | |
| tree | 9be8f15d5603d70e65795410ac9140812f9a79a5 /nixos/modules/services | |
| parent | 70b8167d4ac3572a2f364bba18432ea15df92971 (diff) | |
| download | nixpkgs-628e6a83d0f3b7ddc0592c88fef7978a7ee0063e.tar nixpkgs-628e6a83d0f3b7ddc0592c88fef7978a7ee0063e.tar.gz nixpkgs-628e6a83d0f3b7ddc0592c88fef7978a7ee0063e.tar.bz2 nixpkgs-628e6a83d0f3b7ddc0592c88fef7978a7ee0063e.tar.lz nixpkgs-628e6a83d0f3b7ddc0592c88fef7978a7ee0063e.tar.xz nixpkgs-628e6a83d0f3b7ddc0592c88fef7978a7ee0063e.tar.zst nixpkgs-628e6a83d0f3b7ddc0592c88fef7978a7ee0063e.zip | |
More derp
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/mail/exim.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/smokeping.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/scheduling/cron.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/scheduling/fcron.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/enlightenment.nix | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index b05344fa9b5..440eae281f4 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -89,7 +89,7 @@ in gid = config.ids.gids.exim; }; - security.setuidPrograms = [ "exim" ]; + security.wrappers.exim.source = "${exim}/bin/exim"; systemd.services.exim = { description = "Exim Mail Daemon"; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index eedc2759337..bac79474527 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -273,7 +273,10 @@ in message = "services.smokeping: sendmail and Mailhost cannot both be enabled."; } ]; - security.setuidPrograms = [ "fping" "fping6" ]; + security.wrappers = { + fping.source = "${pkgs.fping}/bin/fping"; + "fping6".source = "${pkgs.fping}/bin/fping6"; + }; environment.systemPackages = [ pkgs.fping ]; users.extraUsers = singleton { name = cfg.user; diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index 48c5f6be316..cc6eb96bf5d 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -93,7 +93,7 @@ in { services.cron.enable = mkDefault (allFiles != []); } (mkIf (config.services.cron.enable) { - security.setuidPrograms = [ "crontab" ]; + security.wrappers.crontab.source = "${pkgs.cronNixosPkg.out}/bin/crontab"; environment.systemPackages = [ cronNixosPkg ]; environment.etc.crontab = { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; } diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix index 339b0de66e9..e4ada276871 100644 --- a/nixos/modules/services/scheduling/fcron.nix +++ b/nixos/modules/services/scheduling/fcron.nix @@ -106,7 +106,7 @@ in environment.systemPackages = [ pkgs.fcron ]; - security.setuidPrograms = [ "fcrontab" ]; + security.wrappers.fcrontab.source = "${pkgs.fcron.out}/bin/fcrontab"; systemd.services.fcron = { description = "fcron daemon"; after = [ "local-fs.target" ]; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index feee6ba87ec..77050bcb23f 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -62,7 +62,8 @@ in ''; }]; - security.setuidPrograms = [ "e_freqset" ]; + security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset"; + environment.etc = singleton { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; target = "X11/xkb"; |