diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-04-18 20:46:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 20:46:28 -0400 |
| commit | 3464b50c618931bd8259c830ee2fd734aeab38f9 (patch) | |
| tree | d9f1763592536fc24e5c80229a3499aada14c577 /nixos/modules/services/monitoring | |
| parent | ebdf7368f7f72bb3bfcae95e3f0d61c0a9607363 (diff) | |
| parent | 55ddb04a8ae3030fc6363874b65845ec7d2a507b (diff) | |
| download | nixpkgs-3464b50c618931bd8259c830ee2fd734aeab38f9.tar nixpkgs-3464b50c618931bd8259c830ee2fd734aeab38f9.tar.gz nixpkgs-3464b50c618931bd8259c830ee2fd734aeab38f9.tar.bz2 nixpkgs-3464b50c618931bd8259c830ee2fd734aeab38f9.tar.lz nixpkgs-3464b50c618931bd8259c830ee2fd734aeab38f9.tar.xz nixpkgs-3464b50c618931bd8259c830ee2fd734aeab38f9.tar.zst nixpkgs-3464b50c618931bd8259c830ee2fd734aeab38f9.zip | |
Merge pull request #59389 from aanderse/issue/53853-1
replace deprecated usage of PermissionsStartOnly (part 1)
Diffstat (limited to 'nixos/modules/services/monitoring')
| -rw-r--r-- | nixos/modules/services/monitoring/collectd.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 45e3312c0f4..6a4c678eb21 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -79,6 +79,10 @@ in { }; config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' - ${cfg.user} - - -" + ]; + systemd.services.collectd = { description = "Collectd Monitoring Agent"; after = [ "network.target" ]; @@ -87,16 +91,9 @@ in { serviceConfig = { ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -f"; User = cfg.user; - PermissionsStartOnly = true; Restart = "on-failure"; RestartSec = 3; }; - - preStart = '' - mkdir -p "${cfg.dataDir}" - chmod 755 "${cfg.dataDir}" - chown -R ${cfg.user} "${cfg.dataDir}" - ''; }; users.users = optional (cfg.user == "collectd") { |