summary refs log tree commit diff
path: root/nixos/modules/services/networking/lldpd.nix
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-08-24 19:53:25 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-08-27 02:33:32 +0200
commit951106c650ce585a5f5afa99e65dd685ab66f6e2 (patch)
tree5e52569f26c8226902dc4a8e7b4dda67df5c2334 /nixos/modules/services/networking/lldpd.nix
parent7c696a08ce0faa7851dec48d9899980699f224a3 (diff)
downloadnixpkgs-951106c650ce585a5f5afa99e65dd685ab66f6e2.tar
nixpkgs-951106c650ce585a5f5afa99e65dd685ab66f6e2.tar.gz
nixpkgs-951106c650ce585a5f5afa99e65dd685ab66f6e2.tar.bz2
nixpkgs-951106c650ce585a5f5afa99e65dd685ab66f6e2.tar.lz
nixpkgs-951106c650ce585a5f5afa99e65dd685ab66f6e2.tar.xz
nixpkgs-951106c650ce585a5f5afa99e65dd685ab66f6e2.tar.zst
nixpkgs-951106c650ce585a5f5afa99e65dd685ab66f6e2.zip
lldpd: 0.9.7 -> 0.9.8
Now uses the upstream systemd unit which adds lots of hardening flags.
Diffstat (limited to 'nixos/modules/services/networking/lldpd.nix')
-rw-r--r--nixos/modules/services/networking/lldpd.nix9
1 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix
index 4f951d843e2..ba4e1b1542f 100644
--- a/nixos/modules/services/networking/lldpd.nix
+++ b/nixos/modules/services/networking/lldpd.nix
@@ -28,16 +28,11 @@ in
     users.extraGroups._lldpd = {};
 
     environment.systemPackages = [ pkgs.lldpd ];
+    systemd.packages = [ pkgs.lldpd ];
 
     systemd.services.lldpd = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      requires = [ "network.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.lldpd}/bin/lldpd -d ${concatStringsSep " " cfg.extraArgs}";
-        PrivateTmp = true;
-        PrivateDevices = true;
-      };
+      environment.LLDPD_OPTIONS = concatStringsSep " " cfg.extraArgs;
     };
   };
 }