[checkmk-commits] Check_MK Git: check_mk: setup.sh: local installation honors livestatus

Module: check_mk Branch: master Commit: a1078c633e221392bc2f196a3918d32dfe4ba262 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1078c633e2213… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 28 12:32:04 2011 +0100 setup.sh: local installation honors livestatus --- scripts/setup.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 3539b3a..c6fa6c3 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -601,10 +601,14 @@ do if [ "${PIPESTATUS[0]}" = 0 ] then - if [ "$livestatus_in_nagioscfg" = False -a -n "$DESTDIR$nagios_config_file" ] + if [ -z "$OMD_ROOT" -a "$livestatus_in_nagioscfg" = False -a -n "$DESTDIR$nagios_config_file" ] then echo -e "# Load Livestatus Module\nbroker_module=$libdir/livestatus.o $livesock\nevent_broker_options=-1" \ + elif [ "$OMD_ROOT" ] ; then + echo -e "# Load Livestatus Module\nbroker_module=$OMD_ROOT/local/lib/mk-livestatus/livestatus.o pnp_path=$OMD_ROOT/var/pnp4nagios/perfdata $livesock\nevent_broker_options=-1" \ + >> $OMD_ROOT/etc/mk-livestatus/nagios-local.cfg + ln -sfn ../../mk-livestatus/nagios-local.cfg $OMD_ROOT/etc/nagios/nagios.d/mk-livestatus.cfg fi else echo -e "\E[1;31;40m ERROR compiling livestatus! \E[0m.\nLogfile is in $SRCDIR/livestatus.log" @@ -664,6 +668,7 @@ do if [ ! -e $DESTDIR$confdir/multisite.mk ] ; then cp $DESTDIR$confdir/multisite.mk-$VERSION $DESTDIR$confdir/multisite.mk fi && + mkdir -p $DESTDIR$confdir/multisite.d && mkdir -p $DESTDIR$confdir/conf.d && echo 'All files in this directory that end with .mk will be read in after main.mk' > $DESTDIR$confdir/conf.d/README && if [ ! -d $DESTDIR$rrddir ] ; then