From 5a166f83d724c94b22b2e2640194d5e0bb7a764a Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 7 Mar 2013 12:23:43 +0100
Subject: [PATCH] Move pidfile and command pipe to /var/run/icinga2 rather than
 /var/run

Fixes #3670
---
 Makefile.am                           | 2 +-
 components/compat/compatcomponent.cpp | 2 +-
 lib/icinga/icingaapplication.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a048ff8b4..6605fc986 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ icinga2varstatedir = ${localstatedir}/lib/${PACKAGE}
 icinga2varstate_DATA =
 
 #run
-icinga2rundir = ${localstatedir}/run
+icinga2rundir = ${localstatedir}/run/${PACKAGE}
 icinga2run_DATA =
 
 #bin
diff --git a/components/compat/compatcomponent.cpp b/components/compat/compatcomponent.cpp
index fa0c187d7..61e0ded39 100644
--- a/components/compat/compatcomponent.cpp
+++ b/components/compat/compatcomponent.cpp
@@ -88,7 +88,7 @@ String CompatComponent::GetCommandPath(void) const
 
 	Value commandPath = config->Get("command_path");
 	if (commandPath.IsEmpty())
-		return Application::GetLocalStateDir() + "/run/icinga.cmd";
+		return Application::GetLocalStateDir() + "/run/icinga/icinga2.cmd";
 	else
 		return commandPath;
 }
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 5b7caf023..9827f3a00 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -161,7 +161,7 @@ String IcingaApplication::GetPidPath(void) const
 	ObjectLock olock(this);
 
 	if (m_PidPath.IsEmpty())
-		return Application::GetLocalStateDir() + "/run/icinga2.pid";
+		return Application::GetLocalStateDir() + "/run/icinga2/icinga2.pid";
 	else
 		return m_PidPath;
 }
-- 
2.40.0