[icinga-checkins] icinga.org: icinga-web/r1.5: * Export reporting cronk configuration ( fixes #1846)

git at icinga.org git at icinga.org
Fri Aug 26 16:28:47 CEST 2011


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

Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Aug 26 10:14:53 2011 +0200

* Export reporting cronk configuration (fixes #1846)

---

 .gitignore                                         |    3 +-
 Makefile.in                                        |    1 +
 .../Reporting/config/{module.xml => module.xml.in} |    5 ++++
 configure                                          |    3 +-
 configure.ac                                       |    7 +++--
 etc/sitecfg/Makefile.in                            |    1 +
 etc/sitecfg/reporting.xml                          |   23 ++++++++++++++++++++
 7 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1663ef7..f7f13d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ app/modules/Api/config/access.xml
 app/modules/Api/config/module.xml
 app/modules/Cronks/config/module.xml
 app/modules/AppKit/config/module.xml
+app/modules/Reporting/config/module.xml
 app/modules/AppKit/config/module.site.xml
 app/modules/Web/config/module.site.xml
 app/modules/Cronks/config/module.site.xml
@@ -49,4 +50,4 @@ lib/icingaScheduler/config.php
 *.swp
 **/*.log
 /.settings/
-/nbproject/private/
\ No newline at end of file
+/nbproject/private/
diff --git a/Makefile.in b/Makefile.in
index b3898df..3683e7d 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,6 +127,7 @@ distclean:
         app/modules/AppKit/config/module.xml \
         app/modules/AppKit/config/auth.xml \
         app/modules/Cronks/config/module.xml \
+	app/modules/Reporting/config/module.xml \
         etc/build.properties \
         tests/phpunit/test.properties \
         etc/apache2/icinga-web.conf \
diff --git a/app/modules/Reporting/config/module.xml b/app/modules/Reporting/config/module.xml.in
similarity index 94%
rename from app/modules/Reporting/config/module.xml
rename to app/modules/Reporting/config/module.xml.in
index 0123e64..711c670 100644
--- a/app/modules/Reporting/config/module.xml
+++ b/app/modules/Reporting/config/module.xml.in
@@ -120,5 +120,10 @@
 		</module>
 		
 	</ae:configuration>
+
+    <!--  Try include the overwriting file -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="@web_conf_folder@/reporting.xml#xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0)xpointer(ae:configurations/node())">
+            <xi:fallback></xi:fallback>
+    </xi:include>
 	
 </ae:configurations>
\ No newline at end of file
diff --git a/configure b/configure
index d1c4605..c6ba00d 100755
--- a/configure
+++ b/configure
@@ -2760,7 +2760,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/icingaScheduler/config.php pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/logging.xml app/config/settings.xml app/config/translation.xml app/modules/Api/config/access.xml app/modules/AppKit/config/module.xml app/modules/AppKit/config/auth.xml app/modules/Cronks/config/module.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf etc/scheduler/icingaCron bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/icingaScheduler/config.php pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/logging.xml app/config/settings.xml app/config/translation.xml app/modules/Api/config/access.xml app/modules/AppKit/config/module.xml app/modules/AppKit/config/auth.xml app/modules/Cronks/config/module.xml app/modules/Reporting/config/module.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf etc/scheduler/icingaCron bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
 
 
 cat >confcache <<\_ACEOF
@@ -3487,6 +3487,7 @@ do
     "app/modules/AppKit/config/module.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/config/module.xml" ;;
     "app/modules/AppKit/config/auth.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/config/auth.xml" ;;
     "app/modules/Cronks/config/module.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Cronks/config/module.xml" ;;
+    "app/modules/Reporting/config/module.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Reporting/config/module.xml" ;;
     "etc/build.properties") CONFIG_FILES="$CONFIG_FILES etc/build.properties" ;;
     "tests/phpunit/test.properties") CONFIG_FILES="$CONFIG_FILES tests/phpunit/test.properties" ;;
     "etc/apache2/icinga-web.conf") CONFIG_FILES="$CONFIG_FILES etc/apache2/icinga-web.conf" ;;
diff --git a/configure.ac b/configure.ac
index 200de1b..8958848 100755
--- a/configure.ac
+++ b/configure.ac
@@ -317,7 +317,7 @@ AC_SUBST(web_conf_folder)
 AC_CONFIG_FILES([
 	Makefile
 	lib/Makefile
-    lib/icingaScheduler/config.php
+	lib/icingaScheduler/config.php
 	pub/Makefile
 	etc/Makefile
 	bin/Makefile
@@ -329,14 +329,15 @@ AC_CONFIG_FILES([
 	app/config/logging.xml
 	app/config/settings.xml
 	app/config/translation.xml
-    app/modules/Api/config/access.xml
+	app/modules/Api/config/access.xml
 	app/modules/AppKit/config/module.xml
 	app/modules/AppKit/config/auth.xml
 	app/modules/Cronks/config/module.xml
+	app/modules/Reporting/config/module.xml
 	etc/build.properties
 	tests/phpunit/test.properties
 	etc/apache2/icinga-web.conf
-    etc/scheduler/icingaCron
+	etc/scheduler/icingaCron
 	bin/clearcache.sh
 	pub/.htaccess
 	pub/soap/.htaccess
diff --git a/etc/sitecfg/Makefile.in b/etc/sitecfg/Makefile.in
index 1b3d71c..764144b 100644
--- a/etc/sitecfg/Makefile.in
+++ b/etc/sitecfg/Makefile.in
@@ -21,3 +21,4 @@ install:
 	$(INSTALL) -m 755 $(INSTALL_OPTS) databases.xml $(DESTDIR)$(prefix)/etc/conf.d/databases.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) cronks.xml $(DESTDIR)$(prefix)/etc/conf.d/cronks.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) translation.xml $(DESTDIR)$(prefix)/etc/conf.d/translation.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) reporting.xml $(DESTDIR)$(prefix)/etc/conf.d/reporting.xml
diff --git a/etc/sitecfg/reporting.xml b/etc/sitecfg/reporting.xml
new file mode 100644
index 0000000..8da6b9b
--- /dev/null
+++ b/etc/sitecfg/reporting.xml
@@ -0,0 +1,23 @@
+<?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">
+            <settings>
+                    <setting name="jasperconfig.default">
+                        <ae:parameter name="jasper_url">http://127.0.0.1:8080/jasperserver</ae:parameter>
+                        <ae:parameter name="jasper_user">jasperadmin</ae:parameter>
+                        <ae:parameter name="jasper_pass">jasperadmin</ae:parameter>
+                        <ae:parameter name="tree_root">/</ae:parameter>
+                    </setting>
+            </settings>
+        </module>
+	-->
+    </ae:configuration>
+</ae:configurations>





More information about the icinga-checkins mailing list