public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/collectd: replace deprecated usage of PermissionsStartOnly

Browse Source 
see https://github.com/NixOS/nixpkgs/issues/53852
This commit is contained in:
Aaron Andersen 2019-02-23 16:17:54 -05:00
parent 78329e37aa
commit 09af9fcd34
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/monitoring/collectd.nix
View File

@ -79,6 +79,10 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.tmpfiles.rules = [
"d '${cfg.dataDir}' - ${cfg.user} - - -"
];
systemd.services.collectd = { systemd.services.collectd = {
description = "Collectd Monitoring Agent"; description = "Collectd Monitoring Agent";
after = [ "network.target" ]; after = [ "network.target" ];
@ -87,16 +91,9 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -f"; ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -f";
User = cfg.user; User = cfg.user;
PermissionsStartOnly = true;
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 3; RestartSec = 3;
}; };
preStart = ''
mkdir -p "${cfg.dataDir}"
chmod 755 "${cfg.dataDir}"
chown -R ${cfg.user} "${cfg.dataDir}"
'';
}; };
users.users = optional (cfg.user == "collectd") { users.users = optional (cfg.user == "collectd") {