[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 f2c4c856bf05e945e9fa9417b45f90b7e9add7d6
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sat Feb 25 09:05:05 2012 +0100

    FIX oups npcd start was not in the correct function

diff --git a/install b/install
index 5e8a938..290c086 100755
--- a/install
+++ b/install
@@ -87,7 +87,6 @@ function remove(){
                             /etc/init.d/apache2 restart >> $TMP/shinken.install.log 2>&1
                             ;;
             esac   
-            /etc/init.d/npcd start
         else 
             cecho " > Aborting uninstallation of pnp4nagios" yellow
         fi
@@ -619,6 +618,7 @@ function sinstall(){
         enablemongologs 
     fi
     fix
+    /etc/init.d/shinken start 
     cecho "+------------------------------------------------------------------------------" green
     cecho "| Shinken is now installed on your server " green
     cecho "| You can start it with /etc/init.d/shinken start " green
@@ -1169,7 +1169,9 @@ function install_pnp4nagios(){
     fi
     cecho " > Enable npcdmod" green
     ip=$(ifconfig | grep "inet adr" | grep -v 127.0.0.1 | awk '{print $2}' | awk -F : '{print $2}' | head -n 1)
-    do_skmacro enable_npcd.macro $PNPPREFIX/etc/npcd.cfg,$ip 
+    do_skmacro enable_npcd.macro $PNPPREFIX/etc/npcd.cfg,$ip
+    cecho " > Starting npcd" green 
+    /etc/init.d/npcd start >> $TMP/shinken.install.log 2>&1 
 }
 
 

-- 
UNNAMED PROJECT