[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 827854f9a6ac887766a071c3d701501f53a6d77d
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Jan 29 20:56:39 2012 +0100

    When removing shinken, it also remove addons installed from shinken installer

diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 834f585..164d2e1 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -49,7 +49,6 @@ function trap_handler()
 }
 
 function remove(){
-    trap 'trap_handler ${LINENO} $? remove' ERR
     cadre "Removing shinken" green
     skill
     
@@ -78,6 +77,29 @@ function remove(){
         fi
     rm -f /etc/init.d/shinken*
 
+    if [ -d "$PNPPREFIX" ]
+    then
+        cecho " > Removing pnp4nagios" green
+        rm -Rf $PNPPREFIX
+        case $CODE in
+                REDHAT)
+                        /etc/init.d/npcd stop
+                        chkconfig npcd off
+                        chkconfig --del npcd 
+                        rm -f /etc/init.d/npcd
+                        rm -f /etc/httpd/conf.d/pnp4nagios
+                        /etc/init.d/httpd restart
+                        ;;
+                DEBIAN)
+                        /etc/init.d/npcd stop
+                        update-rc.d -f npcd remove >> /tmp/shinken.install.log 2>&1 
+                        rm -f /etc/init.d/npcd
+                        rm -f /etc/apache2/conf.d/pnp4nagios
+                        /etc/init.d/apache2 restart
+                        ;;
+        esac    
+    fi
+
     return 0
 }
 

-- 
UNNAMED PROJECT