[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

David GUENAULT dguenault at monitoring-fr.org
Tue Feb 28 22:10:11 UTC 2012


The following commit has been merged in the debian/master branch:
commit a7a0bd2d6e81fd92ce648cd093302515393de281
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Wed Dec 28 15:51:18 2011 +0100

    First attempt to add support for mk_multisite

diff --git a/contrib/alternative-installation/shinken-install/check_mk_setup.conf.in b/contrib/alternative-installation/shinken-install/check_mk_setup.conf.in
new file mode 100644
index 0000000..2ca2363
--- /dev/null
+++ b/contrib/alternative-installation/shinken-install/check_mk_setup.conf.in
@@ -0,0 +1,31 @@
+# Written by setup of check_mk 1.1.12p6 at Wed Dec 28 09:33:23 CET 2011
+bindir='__MKPREFIX__'
+confdir='__MKPREFIX__/etc'
+checksdir='__MKPREFIX__/share/checks'
+modulesdir='__MKPREFIX__/share/modules'
+web_dir='__MKPREFIX__/share/web'
+localedir='__MKPREFIX__/share/locale'
+docdir='__MKPREFIX__/share/doc'
+checkmandir='__MKPREFIX__/share/doc/checks'
+vardir='__MKPREFIX__/var/lib'
+agentsdir='__MKPREFIX__/share/agents'
+agentslibdir='__MKPREFIX__/usr/lib/check_mk_agent'
+agentsconfdir='__MKPREFIX__/etc'
+nagiosuser='__SKUSER__'
+wwwuser='__HTTPUSER__'
+wwwgroup='__HTTPGROUP__'
+nagios_binary='__SKPREFIX__/bin/nagios'
+nagios_config_file='__SKPREFIX__/etc/nagios.cfg'
+nagconfdir='__SKPREFIX__/etc/check_mk.d'
+nagios_startscript='/etc/init.d/shinken'
+nagpipe='__SKPREFIX__/var/rw/nagios.cmd'
+check_result_path='__SKPREFIX__/var/checkresults'
+nagios_status_file='__SKPREFIX__/var/status.dat'
+check_icmp_path='__SKPREFIX__/libexec/check_icmp'
+url_prefix='/'
+apache_config_dir='__HTTPD__/conf.d'
+htpasswd_file='__SKPREFIX__/etc/htpasswd.users'
+nagios_auth_name='Shinken Access'
+pnptemplates='__PNPPREFIX__/share/templates'
+pnprraconf='__PNPPREFIX__/etc'
+enable_livestatus='no'
diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index ba2c2e7..a1e226a 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -87,3 +87,8 @@ export PNPRELEASE="16"
 export PNPPREFIX="/usr/local/pnp4nagios"
 export PNPURI="http://downloads.sourceforge.net/project/pnp4nagios/PNP-$PNPBRANCH/pnp4nagios-$PNPBRANCH.$PNPRELEASE.tar.gz"
 export PNPAPTPKG="rrdtool apache2 libapache2-mod-php5 librrds-perl php5-gd"
+
+export MKVER="1.1.12p6"
+export MKURI="http://mathias-kettner.de/download/check_mk-$MKVER.tar.gz"
+export MKPREFIX="/usr/local/check_mk"
+export MKAPTPKG="libapache2-mod-python"
diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 56b716a..888cb9a 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -1018,6 +1018,51 @@ echo "Usage : shinken -k | -i | -w | -d | -u | -b | -r | -l | -c | -h | -a | -z
 }
 
 # addons installation
+# mk multisite
+
+function install_multisite(){
+	if [ "$CODE" == "REDHAT" ]
+	then
+		cecho " > Unsuported" red
+		exit 2
+	fi
+	cadre "Install check_mk addon" green
+	cecho " > configure response file" green
+	cp check_mk_setup.conf.in $HOME/.check_mk_setup.conf
+	sed -i "s#__PNPPREFIX__#$PNPPREFIX#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__MKPREFIX__#$MKPREFIX#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__SKPREFIX__#$TARGET#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__SKUSER__#$SKUSER#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__SKGROUP__#$SKGROUP#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__HTTPUSER__#www-data#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__HTTPGROUP__#www-data#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__HTTPD__#/etc/apache2#g" $HOME/.check_mk_setup.conf
+	sed -i "s#__HTTPD__#/etc/apache2#g" $HOME/.check_mk_setup.conf
+	cd /tmp
+	cecho " > Installing prerequisites" green
+	for p in $MKAPTPKG
+	do
+		cecho " -> Installing $p" green
+		apt-get --force-yes -y install $p # > /dev/null 2>&1
+	done
+
+	filename=$(echo $MKURI | awk -F"/" '{print $NF}')
+	folder=$(echo $filename | sed -e "s/\.tar\.gz//g")
+	if [ ! -f "$filename" ]
+	then 
+		cecho " > Getting check_mk archive" green
+		wget $MKURI > /dev/null 2>&1
+	fi
+	
+	cecho " > Extracting archive" green
+	if [ -d "$folder" ]
+	then 
+		rm -Rf $folder
+	fi 
+	tar zxvf $filename > /dev/null 2>&1
+	cd $folder
+	cecho " > install multisite"
+}
 
 # pnp4nagios
 function install_pnp4nagios(){
@@ -1288,6 +1333,10 @@ while getopts "kidubcr:lz:hsvp:we:" opt; do
 			then
 				install_pnp4nagios
 				exit 0
+			elif [ "$OPTARG" == "multisite" ]
+			then
+				install_multisite
+				exit 0
 			else
 				cecho " > Unknown plugin $OPTARG" red
 			fi

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list