[icinga-checkins] icinga.org: icinga-web/master: add etc/conf.d/module_api. xml for upgrade safe custom var filters (refs #3183)

git at icinga.org git at icinga.org
Fri Oct 5 15:25:18 CEST 2012


Module: icinga-web
Branch: master
Commit: 2fb8226aa8159459ea2d51802a6e97a3354182c0
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=2fb8226aa8159459ea2d51802a6e97a3354182c0

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Sat Sep 29 11:59:06 2012 +0200

add etc/conf.d/module_api.xml for upgrade safe custom var filters (refs #3183)

Signed-off-by: Michael Friedrich <michael.friedrich at gmail.com>

---

 app/modules/Api/config/module.xml.in |    3 +++
 etc/conf.d/module_api.xml            |   14 ++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/app/modules/Api/config/module.xml.in b/app/modules/Api/config/module.xml.in
index 33d2af1..3d58a9d 100644
--- a/app/modules/Api/config/module.xml.in
+++ b/app/modules/Api/config/module.xml.in
@@ -29,6 +29,9 @@
             <setting name="exclude_customvars">
                 <!-- <ae:parameter>PASSWORD</ae:parameter> -->
                 <!-- <ae:parameter>DN</ae:parameter> -->
+		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="@web_conf_dir@/module_api.xml" xpointer="xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0) xmlns(ac=http://agavi.org/agavi/config/parts/module/1.0) xpointer(//ae:configurations//ae:configuration/ac:settings/node())">
+                    <xi:fallback></xi:fallback>
+		<xi:include>
             </setting>
 
             <setting name="agavi.include.javascript">
diff --git a/etc/conf.d/module_api.xml b/etc/conf.d/module_api.xml
new file mode 100644
index 0000000..b003015
--- /dev/null
+++ b/etc/conf.d/module_api.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ae:configurations xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
+    <ae:configuration>
+            <!--
+                Excluding customvars from queries system wide. So you
+                can hide passwords and other system related information
+                from the users
+            -->
+            <settings>
+                <!-- <ae:parameter>PASSWORD</ae:parameter> -->
+                <!-- <ae:parameter>DN</ae:parameter> -->
+            </settings>
+    </ae:configuration>
+</ae:configurations>





More information about the icinga-checkins mailing list