From aee4b2eddedcdd63a28f3ed4091ce6977d87da9c Mon Sep 17 00:00:00 2001 From: Priyanga Gunaratne Date: Fri, 3 May 2013 18:45:48 -0700 Subject: [PATCH] The diamond pidfile dir is created by the install script and upon rebooting 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. --- debian/diamond.default | 2 +- debian/dirs | 1 - debian/upstart/diamond.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/diamond.default b/debian/diamond.default index 42d28e47e..deda518f2 100644 --- 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 index 98aef7bb0..f1461edd2 100644 --- 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 index e9e5b7537..3cf116428 100644 --- 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