[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 551efc37e328c3bb6e97bfeb15fab5dafa10a5cd
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Mon Jan 30 09:20:56 2012 +0100

    Fix bug when installing pnp4nagios. Now all of the stuff seems to work fine

diff --git a/contrib/alternative-installation/shinken-install/tools/macros/enable_npcd.macro b/contrib/alternative-installation/shinken-install/tools/macros/enable_npcd.macro
index 8db7ace..cc85c94 100644
--- a/contrib/alternative-installation/shinken-install/tools/macros/enable_npcd.macro
+++ b/contrib/alternative-installation/shinken-install/tools/macros/enable_npcd.macro
@@ -5,9 +5,8 @@
 setconfigfile __PREFIX__/etc/shinken-specific.cfg
 setauthfile __PREFIX__/contrib/alternative-installation/shinken-install/tools/macros/auth
 setparam config_file=ARG1 from module where module_type=npcdmod
+setparam uri=http://ARG2/pnp4nagios from module where module_name=PNP_UI
 getdirective modules from broker where broker_name=broker-1
 setparam modules=LAST,NPCDMOD from broker where broker_name=broker-1
-setparam uri=http://ARG2/pnp4nagios from module where module_name=PNP_UI
-getdirective modules from module where module_name=WebUI
-setparam modules=LAST,PNP_UI from module where module_name=WebUI
+setparam modules=Apache_passwd,ActiveDir_UI,Cfg_password,PNP_UI from module where module_type=webui
 writeconfig
diff --git a/contrib/alternative-installation/shinken-install/tools/skonf.py b/contrib/alternative-installation/shinken-install/tools/skonf.py
index f56ab9a..2aaf56a 100755
--- a/contrib/alternative-installation/shinken-install/tools/skonf.py
+++ b/contrib/alternative-installation/shinken-install/tools/skonf.py
@@ -777,10 +777,10 @@ def getdirective(config,objectype,directive,filters):
                 dfilters[k]=v
 
         if config.has_key(objectype):
-            max=len(config[objectype])
-            filterok=0
-            if max > 1 or max == 0:
-                return (False,"Two many values. Refine your filter")
+#            max=len(config[objectype])
+#            filterok=0
+#            if max > 1 or max == 0:
+#                return (False,"Two many values. Refine your filter")
             filterok=0
             for (d,v) in dfilters.items():
                 filterok=filterok+1    

-- 
UNNAMED PROJECT