Move pidfile and command pipe to /var/run/icinga2 rather than /var/run

Fixes #3670

diff --git a/Makefile.am b/Makefile.am
index a048ff8b440a94a9b0fc397d14b71685bb81c8b0..6605fc986567915fa609b92ea32d73f3bcf59240 100644 (file)
--- 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 fa0c187d7fc585ed2ff52135a94c1319f9387207..61e0ded39efd890e6181e6be01e5da8ddad1f535 100644 (file)
--- 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 5b7caf0239c3681aafeb3af177943833265411bb..9827f3a0035d35fb6c8c4157b010b32814cf4152 100644 (file)
--- 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;
 }