tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-31 01:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename directory for Icinga socket files.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-09-30 09:42:27 +02:00
parent 4916dea147
commit 2a051cdea4
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -35,8 +35,8 @@ install-data-local:
$(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster/log $(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster/log
$(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE} $(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}
$(MKDIR_P) $(DESTDIR)${localstatedir}/run/${PACKAGE} $(MKDIR_P) $(DESTDIR)${localstatedir}/run/${PACKAGE}
$(INSTALL) -m 775 -d $(COMMAND_OPTS) $(DESTDIR)${localstatedir}/run/${PACKAGE}/rw $(INSTALL) -m 775 -d $(COMMAND_OPTS) $(DESTDIR)${localstatedir}/run/${PACKAGE}/cmd
chmod g+s $(DESTDIR)${localstatedir}/run/${PACKAGE}/rw chmod g+s $(DESTDIR)${localstatedir}/run/${PACKAGE}/cmd
EXTRA_DIST = $(icinga2doc_DATA) git_version.sh icinga2.spec EXTRA_DIST = $(icinga2doc_DATA) git_version.sh icinga2.spec

2
components/compat/externalcommandlistener.cpp
View File

@ -50,7 +50,7 @@ void ExternalCommandListener::Start(void)
String ExternalCommandListener::GetCommandPath(void) const String ExternalCommandListener::GetCommandPath(void) const
{ {
if (m_CommandPath.IsEmpty()) if (m_CommandPath.IsEmpty())
return Application::GetLocalStateDir() + "/run/icinga2/rw/icinga2.cmd"; return Application::GetLocalStateDir() + "/run/icinga2/cmd/icinga2.cmd";
else else
return m_CommandPath; return m_CommandPath;
} }

2
components/livestatus/listener.cpp
View File

@ -93,7 +93,7 @@ String LivestatusListener::GetSocketPath(void) const
{ {
Value socketPath = m_SocketPath; Value socketPath = m_SocketPath;
if (socketPath.IsEmpty()) if (socketPath.IsEmpty())
return Application::GetLocalStateDir() + "/run/icinga2/rw/livestatus"; return Application::GetLocalStateDir() + "/run/icinga2/cmd/livestatus";
else else
return socketPath; return socketPath;
} }

2
contrib/config/mf/icinga2.conf
View File

@ -64,7 +64,7 @@ object LivestatusListener "livestatus-tcp" {
object LivestatusListener "livestatus-unix" { object LivestatusListener "livestatus-unix" {
socket_type = "unix", socket_type = "unix",
socket_path = (Icinga2Prefix + "/var/run/icinga2/rw/livestatus") socket_path = (Icinga2Prefix + "/var/run/icinga2/cmd/livestatus")
} }
/** /**

2
contrib/process_check_result
View File

@ -34,7 +34,7 @@ EOF
ECHO="/bin/echo" ECHO="/bin/echo"
CMDFILE="/var/run/icinga2/rw/icinga2.cmd" CMDFILE="/var/run/icinga2/cmd/icinga2.cmd"
HOST="" HOST=""
SERVICE="" SERVICE=""
RETURNCODE=0 RETURNCODE=0

6
doc/2.1.2-setting-up-icinga-classic-ui.md
View File

@ -41,7 +41,7 @@ OPTIONS* section:
object\_cache\_file |/var/cache/icinga2/objects.cache object\_cache\_file |/var/cache/icinga2/objects.cache
status\_file |/var/cache/icinga2/status.dat status\_file |/var/cache/icinga2/status.dat
resource\_file |- resource\_file |-
command\_file |/var/run/icinga2/rw/icinga2.cmd command\_file |/var/run/icinga2/cmd/icinga2.cmd
check\_external\_commands |1 check\_external\_commands |1
interval\_length |60 interval\_length |60
status\_update\_interval |10 status\_update\_interval |10
@ -59,8 +59,8 @@ OPTIONS* section:
In order for commands to work you will need to grant the web server In order for commands to work you will need to grant the web server
write permissions for the command pipe: write permissions for the command pipe:
# chgrp www-data /var/run/icinga2/rw/icinga2.cmd # chgrp www-data /var/run/icinga2/cmd/icinga2.cmd
# chmod 660 /var/run/icinga2/rw/icinga2.cmd # chmod 660 /var/run/icinga2/cmd/icinga2.cmd
> **Note** > **Note**
> >

4
doc/3.3-object-types.md
View File

@ -498,14 +498,14 @@ Example:
library "compat" library "compat"
object ExternalCommandListener "external" { object ExternalCommandListener "external" {
command\_path = "/var/run/icinga2/rw/icinga2.cmd" command\_path = "/var/run/icinga2/cmd/icinga2.cmd"
} }
Attributes: Attributes:
Name |Description Name |Description
----------------|---------------- ----------------|----------------
command\_path |**Optional.** Path to the command pipe. Defaults to IcingaLocalStateDir + "/run/icinga2/rw/icinga2.cmd". command\_path |**Optional.** Path to the command pipe. Defaults to IcingaLocalStateDir + "/run/icinga2/cmd/icinga2.cmd".
### CompatLogger ### CompatLogger