tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fixes #3670
This commit is contained in:
Gunnar Beutner 2013-03-07 12:23:43 +01:00
parent 02be9010e7
commit 5a166f83d7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -37,7 +37,7 @@ icinga2varstatedir = ${localstatedir}/lib/${PACKAGE}
icinga2varstate_DATA =
#run
icinga2rundir = ${localstatedir}/run
icinga2rundir = ${localstatedir}/run/${PACKAGE}
icinga2run_DATA =
#bin

2
components/compat/compatcomponent.cpp
View File

@ -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;
}

2
lib/icinga/icingaapplication.cpp
View File

@ -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;
}