[prev in list] [next in list] [prev in thread] [next in thread] 

List:       omd-commits
Subject:    [omd-commits] OMD Git: omd: shinken: stop xinetd to listen on the livestatus port ( brokerd listens 
From:       git () mathias-kettner ! de (git version control)
Date:       2013-06-05 12:26:25
Message-ID: 20130605122625.2511F8203A () mail ! mathias-kettner ! de
[Download RAW message or body]

Module:   omd
Branch:   master
Commit:   c378fd5c7019f5223e33a11b59a4ee48fc547eed
URL:      http://omdistro.org/projects/omd/repository/revisions/c378fd5c7019f5223e33a11b59a4ee48fc547eed


Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jun  5 14:22:04 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Wed Jun  5 14:22:04 2013 +0200

shinken: stop xinetd to listen on the livestatus port (brokerd listens itself)

---

 packages/shinken/skel/etc/init.d/shinken |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/shinken/skel/etc/init.d/shinken \
b/packages/shinken/skel/etc/init.d/shinken index aa8f95a..1e60a0b 100644
--- a/packages/shinken/skel/etc/init.d/shinken
+++ b/packages/shinken/skel/etc/init.d/shinken
@@ -150,6 +150,12 @@ EOTXT
     #  sed -ri 's/^([[:space:]]*port[[:space:]]*)(.+)/\1none/' \
$TARGET_ETC/shinken-specific.d/module_livestatus.cfg  #fi
     #
+    # Remove the xinet-mk-livestatus-config if we listen on a port ourselves
+    #
+    if [ "$LIVESTATUS_TCP" = "on" ]; then
+      test -f ###ROOT###/etc/mk-livestatus/xinetd.conf && rm -f \
###ROOT###/etc/mk-livestatus/xinetd.conf +    fi
+    #
     # Add the npcd module to the broker
     #
     if [ "$PNP4NAGIOS" = "on" ]; then


[prev in list] [next in list] [prev in thread] [next in thread]