[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 016db4e7560fc8ef5ccdb6357745ef691650d94a

[David GUENAULT]

The following commit has been merged in the master branch:
commit 2d54fa60b2788742aedea210e1b83396e2fd87a8
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Wed Nov 9 20:42:33 2011 +0100

    Now sync is based on setauthfile

diff --git a/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_tagged_poller.macro b/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_tagged_poller.macro
index 16a7f2e..4e931f3 100644
--- a/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_tagged_poller.macro
+++ b/contrib/alternative-installation/shinken-install/tools/macros/ces_add_satellite_tagged_poller.macro
@@ -1,12 +1,27 @@
 # macro for adding a shinken satellite with a tagged poller also deploy config on satellites
 # Arguments are :
 # ARG1 : new poller name
-# ARG2 : new poller address
-# ARG3 : existing poller name that will be used as model for the new poller
+# ARG2 : new poller tag
+# ARG3 : new poller address
+# ARG4 : existing poller name that will be used as model for the new poller
+#
+# set configuration file
 setconfigfile /opt/shinken/etc/shinken-specific.cfg
-clone poller set poller_name=ARG1,address=ARG2 where poller_name=ARG3
-setparam poller_tags=ARG1 from poller where poller_name=ARG1
+# set authentication file
+setauthfile /root/shinken/contrib/alternative-installation/shinken-install/tools/macros/auth
+# remove existing poller if exist
+onerror continue
+delete poller where poller_name=ARG1
+onerror stop
+# clone existing poller
+clone poller set poller_name=ARG1,address=ARG3 where poller_name=ARG4
+# add poller tag
+setparam poller_tags=ARG2 from poller where poller_name=ARG1
+# get existing module for Arbiter
 getdirective modules from arbiter where arbiter_name=Arbiter-Master
+# add HackPollerTagByMacros module to Arbiter
 setparam modules=LAST, HackPollerTagByMacros from arbiter where arbiter_name=Arbiter-Master
+# write config
 writeconfig
-sync /root/shinken/contrib/alternative-installation/shinken-install/tools/macros/auth
+# deploy configuration
+sync 

-- 
UNNAMED PROJECT