From 9c3c7a75d3a5969bd89922a67f28c3d760f4b796 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 17 Sep 2014 19:20:12 +0200
Subject: collectd: add pidFile option, change default pid to
 /var/run/collectd.pid

---
 nixos/modules/services/monitoring/collectd.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'nixos/modules/services/monitoring/collectd.nix')

diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index 6da92db7e5f5..717c2c481683 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -7,7 +7,7 @@ let
 
   conf = pkgs.writeText "collectd.conf" ''
     BaseDir "${cfg.dataDir}"
-    PIDFile "${cfg.dataDir}/collectd.pid"
+    PIDFile "${cfg.pidFile}"
     AutoLoadPlugin ${if cfg.autoLoadPlugin then "true" else "false"}
     Hostname ${config.networking.hostName}
 
@@ -50,6 +50,14 @@ in {
       type = path;
     };
 
+    pidFile = mkOption {
+      default = "/var/run/collectd.pid";
+      description = ''
+        Location of collectd pid file.
+      '';
+      type = path;
+    };
+
     autoLoadPlugin = mkOption {
       default = false;
       description = ''
@@ -83,16 +91,20 @@ in {
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.dataDir}/collectd.pid";
+        ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.pidFile}";
         Type = "forking";
-        PIDFile = "${cfg.dataDir}/collectd.pid";
+        PIDFile = cfg.pidFile;
         User = optional (cfg.user!="root") cfg.user;
         PermissionsStartOnly = true;
       };
 
       preStart = ''
         mkdir -m 0700 -p ${cfg.dataDir}
-        if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user} ${cfg.dataDir}; fi
+        install -D /dev/null ${cfg.pidFile}
+        if [ "$(id -u)" = 0 ]; then
+          chown -R ${cfg.user} ${cfg.dataDir};
+          chown ${cfg.user} ${cfg.pidFile}
+        fi
       '';
     }; 
 
-- 
cgit 1.4.1