git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93699 from NixOS/f/do

nixos/do-agent: use .service from upstream

commite3d45be66fcd7abbafb6f47e7890f60320905eed authorPeter Hoeg <peter@hoeg.com> dateWed 29 Jul 2020, 09:13 (6 years ago) parent56c86e7e0589ec
2 files changed+9−14
nixos/modules/services/monitoring/do-agent.nix+4−13 pkgs/servers/monitoring/do-agent/default.nix+5−1
nixos/modules/services/monitoring/do-agent.nix+4−13
@@ -4,6 +4,7 @@ with lib;
44
55let
66 cfg = config.services.do-agent;
7+
78in
89{
910 options.services.do-agent = {
@@ -11,23 +12,13 @@ in
1112 };
1213
1314 config = mkIf cfg.enable {
14− environment.systemPackages = [ pkgs.do-agent ];
15+ systemd.packages = [ pkgs.do-agent ];
1516
1617 systemd.services.do-agent = {
17− description = "DigitalOcean Droplet Metrics Agent";
1818 wantedBy = [ "multi-user.target" ];
19− after = [ "network-online.target" ];
20− wants = [ "network-online.target" ];
2119 serviceConfig = {
22− ExecStart = "${pkgs.do-agent}/bin/do-agent --syslog";
23− Restart = "always";
24− OOMScoreAdjust = -900;
25− SyslogIdentifier = "DigitalOceanAgent";
26− PrivateTmp = "yes";
27− ProtectSystem = "full";
28− ProtectHome = "yes";
29− NoNewPrivileges = "yes";
30− DynamicUser = "yes";
20+ ExecStart = [ "" "${pkgs.do-agent}/bin/do-agent --syslog" ];
21+ DynamicUser = true;
3122 };
3223 };
3324 };
pkgs/servers/monitoring/do-agent/default.nix+5−1
@@ -18,6 +18,10 @@ buildGoModule rec {
1818
1919 vendorSha256 = null;
2020
21+ postInstall = ''
22+ install -Dm444 -t $out/lib/systemd/system $src/packaging/etc/systemd/system/do-agent.service
23+ '';
24+
2125 meta = with lib; {
2226 description = "DigitalOcean droplet system metrics agent";
2327 longDescription = ''
@@ -30,4 +34,4 @@ buildGoModule rec {
3034 maintainers = with maintainers; [ yvt ];
3135 platforms = platforms.linux;
3236 };
33−}
37+}