The diamond pidfile dir is created by the install script and upon reb…

…ooting the host machine, diamond cannot restart as the /var/run dir has been cleared by the reboot. This commit changes the pidfile location to /var/run from /var/run/diamond.
bakerkj · May 6, 2013 · aee4b2e · aee4b2e
1 parent 057407d
commit aee4b2e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/debian/diamond.default b/debian/diamond.default
@@ -8,5 +8,5 @@
 
 # Additional options that are passed to the Daemon.
 ENABLE_DIAMOND="yes"
-DIAMOND_PID="/var/run/diamond/diamond.pid"
+DIAMOND_PID="/var/run/diamond.pid"
 DIAMOND_USER="diamond"
diff --git a/debian/dirs b/debian/dirs
@@ -1,3 +1,2 @@
 etc/diamond/collectors
 var/log/diamond
-var/run/diamond
diff --git a/debian/upstart/diamond.conf b/debian/upstart/diamond.conf
@@ -17,7 +17,7 @@ script
         . /etc/default/diamond
     else
         ENABLE_DIAMOND="yes"
-        DIAMOND_PID="/var/run/diamond/diamond.pid"
+        DIAMOND_PID="/var/run/diamond.pid"
         DIAMOND_USER="diamond"
     fi