[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 77c535938ea5c8478cf6c067840fecebd62637d1
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sat Dec 31 11:38:49 2011 +0100

    Now retention is enabled by default at installation time (Pickle)

diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 970391b..f4ea51b 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -474,7 +474,7 @@ function enable(){
 }
 
 function sinstall(){
-	trap 'trap_handler ${LINENO} $? install' ERR
+	#trap 'trap_handler ${LINENO} $? install' ERR
 	#cecho "Installing shinken" green
 	check_distro
 	check_exist
@@ -485,6 +485,7 @@ function sinstall(){
 	ln -s $TARGET/bin/default/shinken /etc/default/shinken
 	cp $TARGET/bin/init.d/shinken* /etc/init.d/
 	mkdir -p $TARGET/var/archives
+	#enableretention
 	fix
 	cecho "+------------------------------------------------------------------------------" green
 	cecho "| shinken is now installed on your server " green
@@ -921,13 +922,27 @@ function enablendodb(){
     fi
 }
 
+#function enableretention(){
+#
+#	cecho " > Enable retention for broker scheduler and arbiter" green
+#
+#	export PYTHONPATH=$TARGET
+#	export PY="$(pythonver)"
+#	result=$($PY $myscripts/tools/skonf.py -a macros -f $myscripts/tools/macros/ces_enable_retention.macro)	
+#    if [ $? -ne 0 ]
+#    then
+#        cecho $result red
+#        exit 2
+#    fi
+#}
+
 function enableretention(){
 
 	cecho " > Enable retention for broker scheduler and arbiter" green
 
 	export PYTHONPATH=$TARGET
 	export PY="$(pythonver)"
-	result=$($PY $myscripts/tools/skonf.py -a macros -f $myscripts/tools/macros/ces_enable_retention.macro)	
+	result=$($PY $myscripts/tools/skonf.py -a macros -f $myscripts/tools/macros/enable_retention.macro)	
     if [ $? -ne 0 ]
     then
         cecho $result red
@@ -1429,7 +1444,7 @@ while getopts "kidubcr:lz:hsvp:we:" opt; do
                 fixcentreondb
 				fixforfan
                 enablendodb
-                enableretention
+                #enableretention
                 enableperfdata
                 setdaemonsaddresses
                 enableCESCentralDaemons
diff --git a/contrib/alternative-installation/shinken-install/tools/macros/ces_enable_retention.macro b/contrib/alternative-installation/shinken-install/tools/macros/enable_retention.macro
similarity index 81%
copy from contrib/alternative-installation/shinken-install/tools/macros/ces_enable_retention.macro
copy to contrib/alternative-installation/shinken-install/tools/macros/enable_retention.macro
index b45516d..c24f000 100644
--- a/contrib/alternative-installation/shinken-install/tools/macros/ces_enable_retention.macro
+++ b/contrib/alternative-installation/shinken-install/tools/macros/enable_retention.macro
@@ -1,5 +1,5 @@
-# Enable retention on broker scheduler and arbiter 
-setconfigfile /opt/shinken/etc/shinken-specific.cfg
+# Enable retention for all daemons 
+setconfigfile __PREFIX__/etc/shinken-specific.cfg
 getdirective modules from scheduler where scheduler_name=scheduler-1
 setparam modules=LAST,PickleRetention from scheduler where scheduler_name=scheduler-1
 getdirective modules from broker where broker_name=broker-1

-- 
UNNAMED PROJECT