summary refs log tree commit diff
path: root/nixos/modules/services/networking
diff options
context:
space:
mode:
authorGuillaume Girol <symphorien@users.noreply.github.com>2021-09-18 15:28:49 +0000
committerGitHub <noreply@github.com>2021-09-18 15:28:49 +0000
commitceb2e6667b064ce5130f751d7b6625a81e191dec (patch)
tree25580706229710dd815d1d228474488331eb6b6e /nixos/modules/services/networking
parenta92dd171bae2db6eeff74a3d31fa99e47e793359 (diff)
parent27b0c53d237b6c0411dc5798376b0ba6fbad0df0 (diff)
downloadnixpkgs-ceb2e6667b064ce5130f751d7b6625a81e191dec.tar
nixpkgs-ceb2e6667b064ce5130f751d7b6625a81e191dec.tar.gz
nixpkgs-ceb2e6667b064ce5130f751d7b6625a81e191dec.tar.bz2
nixpkgs-ceb2e6667b064ce5130f751d7b6625a81e191dec.tar.lz
nixpkgs-ceb2e6667b064ce5130f751d7b6625a81e191dec.tar.xz
nixpkgs-ceb2e6667b064ce5130f751d7b6625a81e191dec.tar.zst
nixpkgs-ceb2e6667b064ce5130f751d7b6625a81e191dec.zip
Merge pull request #126289 from rnhmjoj/wrappers
nixos/security/wrappers: make well-typed
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r--nixos/modules/services/networking/smokeping.nix14
-rw-r--r--nixos/modules/services/networking/x2goserver.nix2
2 files changed, 14 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index ef411767a94..12d7ffe8675 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -278,8 +278,18 @@ in
       }
     ];
     security.wrappers = {
-      fping.source = "${pkgs.fping}/bin/fping";
-      fping6.source = "${pkgs.fping}/bin/fping6";
+      fping =
+        { setuid = true;
+          owner = "root";
+          group = "root";
+          source = "${pkgs.fping}/bin/fping";
+        };
+      fping6 =
+        { setuid = true;
+          owner = "root";
+          group = "root";
+          source = "${pkgs.fping}/bin/fping6";
+        };
     };
     environment.systemPackages = [ pkgs.fping ];
     users.users.${cfg.user} = {
diff --git a/nixos/modules/services/networking/x2goserver.nix b/nixos/modules/services/networking/x2goserver.nix
index 48020fc1cec..554e51f9d4f 100644
--- a/nixos/modules/services/networking/x2goserver.nix
+++ b/nixos/modules/services/networking/x2goserver.nix
@@ -88,12 +88,14 @@ in {
       source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl";
       owner = "x2go";
       group = "x2go";
+      setuid = false;
       setgid = true;
     };
     security.wrappers.x2goprintWrapper = {
       source = "${pkgs.x2goserver}/bin/x2goprint";
       owner = "x2go";
       group = "x2go";
+      setuid = false;
       setgid = true;
     };