Rename directory for Icinga socket files.

diff --git a/Makefile.am b/Makefile.am
index e636d0f90f6339b85abffcffe4b092a4bdb54384..9fb31406d842c36f0a36de80e841df3cb28dc14b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,8 @@ install-data-local:
        $(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}/cluster/log
        $(MKDIR_P) $(DESTDIR)${localstatedir}/lib/${PACKAGE}
        $(MKDIR_P) $(DESTDIR)${localstatedir}/run/${PACKAGE}
-       $(INSTALL) -m 775 -d $(COMMAND_OPTS) $(DESTDIR)${localstatedir}/run/${PACKAGE}/rw
-       chmod g+s $(DESTDIR)${localstatedir}/run/${PACKAGE}/rw
+       $(INSTALL) -m 775 -d $(COMMAND_OPTS) $(DESTDIR)${localstatedir}/run/${PACKAGE}/cmd
+       chmod g+s $(DESTDIR)${localstatedir}/run/${PACKAGE}/cmd
 
 EXTRA_DIST = $(icinga2doc_DATA) git_version.sh icinga2.spec
 

diff --git a/components/compat/externalcommandlistener.cpp b/components/compat/externalcommandlistener.cpp
index 8167146eba26bcc6b4b6d00a89703734340d44d0..22e62c735b3949e4a133cabf0d509234c5025e59 100644 (file)
--- a/components/compat/externalcommandlistener.cpp
+++ b/components/compat/externalcommandlistener.cpp
@@ -50,7 +50,7 @@ void ExternalCommandListener::Start(void)
 String ExternalCommandListener::GetCommandPath(void) const
 {
        if (m_CommandPath.IsEmpty())
-               return Application::GetLocalStateDir() + "/run/icinga2/rw/icinga2.cmd";
+               return Application::GetLocalStateDir() + "/run/icinga2/cmd/icinga2.cmd";
        else
                return m_CommandPath;
 }

diff --git a/components/livestatus/listener.cpp b/components/livestatus/listener.cpp
index a72e545a9c60c5e50b1889526f52f39c3a3d0314..f829fa696dbb1a73a5009e258709966f26709a90 100644 (file)
--- a/components/livestatus/listener.cpp
+++ b/components/livestatus/listener.cpp
@@ -93,7 +93,7 @@ String LivestatusListener::GetSocketPath(void) const
 {
        Value socketPath = m_SocketPath;
        if (socketPath.IsEmpty())
-               return Application::GetLocalStateDir() + "/run/icinga2/rw/livestatus";
+               return Application::GetLocalStateDir() + "/run/icinga2/cmd/livestatus";
        else
                return socketPath;
 }

diff --git a/contrib/config/mf/icinga2.conf b/contrib/config/mf/icinga2.conf
index 38bcb63eefe5bdb925dad0ed002327b6f9b625c8..84588fe9565c9cce327b113bbc92509181e94e26 100644 (file)
--- a/contrib/config/mf/icinga2.conf
+++ b/contrib/config/mf/icinga2.conf
@@ -64,7 +64,7 @@ object LivestatusListener "livestatus-tcp" {
 
 object LivestatusListener "livestatus-unix" {
   socket_type = "unix",
-  socket_path = (Icinga2Prefix + "/var/run/icinga2/rw/livestatus")
+  socket_path = (Icinga2Prefix + "/var/run/icinga2/cmd/livestatus")
 }
 
 /**

diff --git a/contrib/process_check_result b/contrib/process_check_result
index 834aea5dbc2b773a074e507c2aff45ef24bf5f10..51abce1ae410d86bae5259d2086e78d2400a61da 100755 (executable)
--- a/contrib/process_check_result
+++ b/contrib/process_check_result
@@ -34,7 +34,7 @@ EOF
 
 
 ECHO="/bin/echo"
-CMDFILE="/var/run/icinga2/rw/icinga2.cmd"
+CMDFILE="/var/run/icinga2/cmd/icinga2.cmd"
 HOST=""
 SERVICE=""
 RETURNCODE=0

diff --git a/doc/2.1.2-setting-up-icinga-classic-ui.md b/doc/2.1.2-setting-up-icinga-classic-ui.md
index 11c67bb7d0c00bdfa7553ed147eefcef949847c9..7a255afcfa14e2faa68858d3f61283a21ce7007c 100644 (file)
--- a/doc/2.1.2-setting-up-icinga-classic-ui.md
+++ b/doc/2.1.2-setting-up-icinga-classic-ui.md
@@ -41,7 +41,7 @@ OPTIONS* section:
   object\_cache\_file                 |/var/cache/icinga2/objects.cache
   status\_file                        |/var/cache/icinga2/status.dat
   resource\_file                      |-
-  command\_file                       |/var/run/icinga2/rw/icinga2.cmd
+  command\_file                       |/var/run/icinga2/cmd/icinga2.cmd
   check\_external\_commands           |1
   interval\_length                    |60
   status\_update\_interval            |10
@@ -59,8 +59,8 @@ OPTIONS* section:
 In order for commands to work you will need to grant the web server
 write permissions for the command pipe:
 
-    # chgrp www-data /var/run/icinga2/rw/icinga2.cmd
-    # chmod 660 /var/run/icinga2/rw/icinga2.cmd
+    # chgrp www-data /var/run/icinga2/cmd/icinga2.cmd
+    # chmod 660 /var/run/icinga2/cmd/icinga2.cmd
 
 > **Note**
 >

diff --git a/doc/3.3-object-types.md b/doc/3.3-object-types.md
index 608ce58ad63bd888b6e5de4722870fafc87fdfd7..5eeb7cae1b6981aa1dd765fb311dd22cb08944eb 100644 (file)
--- a/doc/3.3-object-types.md
+++ b/doc/3.3-object-types.md
@@ -498,14 +498,14 @@ Example:
     library "compat"
 
     object ExternalCommandListener "external" {
-        command\_path = "/var/run/icinga2/rw/icinga2.cmd"
+        command\_path = "/var/run/icinga2/cmd/icinga2.cmd"
     }
 
 Attributes:
 
   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