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

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit 148e9355f560ab49d2c4be122caeadd15a5ee517
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Mon Feb 6 17:22:39 2012 +0100

    Fix some unexpected behaviour when removing shinken

diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 4c93e8b..943aad1 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -115,6 +115,10 @@ function remove(){
         then
             cecho " > Removing check_mk multisite" green
             rm -Rf $MKPREFIX
+            if [ -d $PNPPREFIX.MK ]
+            then
+                rm -Rf $PNPPREFIX.MK
+            fi
             case $CODE in
                     REDHAT)
                             rm -f /etc/httpd/conf.d/zzz_check_mk.conf >> /tmp/shinken.install.log 2>&1
@@ -929,6 +933,14 @@ function install_multisite(){
     fi 
     tar zxvf $filename >> /tmp/shinken.install.log 2>&1 
     cd $folder
+
+    # check if pnp4nagios is here if not move the resulting folder 
+    movepnp=0
+    if [ ! -d "$PNPPREFIX" ]
+    then
+        movepnp=1
+    fi
+
     cecho " > Install multisite" green
     ./setup.sh --yes >> /tmp/shinken.install.log 2>&1 
     cecho " > Default configuration for multisite" green
@@ -951,7 +963,10 @@ function install_multisite(){
     echo "# Needed for WATO - the Check_MK Web Administration Tool" >> /etc/sudoers
     echo "Defaults:www-data !requiretty" >> /etc/sudoers
     echo "www-data ALL = (root) NOPASSWD: $MKTARGET/check_mk --automation *" >> /etc/sudoers
-    /etc/init.d/sudo restart
+    if [ $movepnp -eq 1 ]
+    then 
+        mv $PNPPREFIX $PNPPREFIX.MK
+    fi
 }
 
 # pnp4nagios

-- 
UNNAMED PROJECT