[icinga-checkins] icinga.org: icinga-web/r1.6: * Adding missing config files (fixes #2376)

git at icinga.org git at icinga.org
Wed Feb 29 16:40:55 CET 2012


Module: icinga-web
Branch: r1.6
Commit: 35a3b261f7b445b24e5bbec99c14be330431f1e5
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=35a3b261f7b445b24e5bbec99c14be330431f1e5

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Feb 29 15:54:59 2012 +0100

* Adding missing config files (fixes #2376)

---

 .gitignore                   |    5 ++++-
 etc/conf.d/logging.xml       |   16 ++++++++++++++++
 etc/conf.d/module_appkit.xml |   30 ++++++++++++++++++++++++++++++
 etc/conf.d/module_cronks.xml |   18 ++++++++++++++++++
 etc/conf.d/module_web.xml    |    7 +++++++
 5 files changed, 75 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c7915b..4f8a671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,10 @@ Makefile
 config.log
 config.status
 etc/build.properties
-etc/conf.d/*.xml
+etc/conf.d/access.xml
+etc/conf.d/databases.xml
+etc/conf.d/Makefile
+etc/conf.d/sla.xml
 tests/phpunit/test.properties
 tests/php/results.xml
 etc/apache2/icinga-web.conf
diff --git a/etc/conf.d/logging.xml b/etc/conf.d/logging.xml
new file mode 100644
index 0000000..0d2b47a
--- /dev/null
+++ b/etc/conf.d/logging.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ae:configurations xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0" xmlns="http://agavi.org/agavi/config/parts/logging/1.0">
+    <ae:configuration>
+    
+        <!-- Deactivating debug log -->
+        <!-- Please see also module_appkit.xml for more verbose logging if needed -->
+        <!-- 
+        <loggers default="icinga-web">
+            <logger name="icinga-debug" class="AgaviLogger" level="">
+                
+            </logger>
+        </loggers>
+        -->
+    
+    </ae:configuration>
+</ae:configurations>
\ No newline at end of file
diff --git a/etc/conf.d/module_appkit.xml b/etc/conf.d/module_appkit.xml
new file mode 100644
index 0000000..f08f272
--- /dev/null
+++ b/etc/conf.d/module_appkit.xml
@@ -0,0 +1,30 @@
+<?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>
+        <module enabled="true">
+            <!-- Overwrite debuglog handling(verbosy) -->
+            <settings>
+            
+                <!-- Ajax default request timeout (ms), 4 minutes == 240000 -->
+                <setting name="ajax.timeout">240000</setting>
+            
+                <setting name="debug.verbose">
+                    <!--  Debug output for db queries -->
+                    <!-- 
+                    <ae:parameter>Api_Store_LegacyLayer_IcingaApiModel</ae:parameter>
+                    -->
+                    
+                    <!--  Debug output for object search -->
+                    <!-- 
+                    <ae:parameter>Cronks_System_ObjectSearchResultModel</ae:parameter>
+                    -->
+            
+                    <!-- Debug output for Session handling via Doctrine-->
+                    <!-- 
+                    <ae:parameter>AppKitDoctrineSessionStorage</ae:parameter>
+                    -->
+                </setting>
+            </settings>
+        </module>
+    </ae:configuration>
+</ae:configurations>
diff --git a/etc/conf.d/module_cronks.xml b/etc/conf.d/module_cronks.xml
new file mode 100644
index 0000000..18d0a5b
--- /dev/null
+++ b/etc/conf.d/module_cronks.xml
@@ -0,0 +1,18 @@
+<?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>
+
+        <!--
+            Overwrite or append your reporting cronk configuration
+            here
+        -->
+
+        <module enabled="true">
+        <!--
+        	<setting name="portal.loadmasktimeout">5000</setting>
+        -->
+        </module>
+    
+    </ae:configuration>
+</ae:configurations>
+
diff --git a/etc/conf.d/module_web.xml b/etc/conf.d/module_web.xml
new file mode 100644
index 0000000..7ee613c
--- /dev/null
+++ b/etc/conf.d/module_web.xml
@@ -0,0 +1,7 @@
+<?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>
+        <module enabled="true">
+        </module>
+    </ae:configuration>
+</ae:configurations>





More information about the icinga-checkins mailing list