[icinga-checkins] icinga.org: icinga-web/mhein/default: * Added more agavi site config files (ref #970)

git at icinga.org git at icinga.org
Mon Jan 24 13:32:26 CET 2011


Module: icinga-web
Branch: mhein/default
Commit: 93a8800fe969fc6f49ff18fb6466367c44bd44a2
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=93a8800fe969fc6f49ff18fb6466367c44bd44a2

Author: Marius Hein <marius.hein at netways.de>
Date:   Mon Jan 24 12:30:28 2011 +0100

* Added more agavi site config files (ref #970)

---

 .gitignore                       |    3 +++
 app/config/factories.xml         |    5 +++++
 app/config/translation.xml       |    5 +++++
 etc/sitecfg/Makefile.in          |    5 ++++-
 etc/sitecfg/factories.site.xml   |   15 +++++++++++++++
 etc/sitecfg/settings.site.xml    |   12 ++++++++++++
 etc/sitecfg/translation.site.xml |   34 ++++++++++++++++++++++++++++++++++
 7 files changed, 78 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5173432..e38e6e3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@ app/data/log/
 app/config/icinga.xml
 app/config/databases.xml
 app/config/settings.xml
+app/config/settings.site.xml
+app/config/translation.site.xml
+app/config/factories.site.xml
 app/modules/Web/config/icinga-io.xml
 app/modules/AppKit/cache/Widgets/SquishLoader.xml
 bin/clearcache.sh
diff --git a/app/config/factories.xml b/app/config/factories.xml
index 6194fbb..0475c96 100755
--- a/app/config/factories.xml
+++ b/app/config/factories.xml
@@ -79,4 +79,9 @@
 		<logger_manager class="AgaviLoggerManager" />
 	</ae:configuration>
 	
+	<!--  Try include the overwriting file -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="factories.site.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/app/config/translation.xml b/app/config/translation.xml
index 7867e27..4928273 100755
--- a/app/config/translation.xml
+++ b/app/config/translation.xml
@@ -163,5 +163,10 @@
 		</translators>
 		
 	</ae:configuration>
+	
+	<!--  Try include the overwriting file -->
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="translation.site.xml#xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0)xpointer(ae:configurations/node())">
+		<xi:fallback></xi:fallback>
+	</xi:include>
 
 </ae:configurations>
diff --git a/etc/sitecfg/Makefile.in b/etc/sitecfg/Makefile.in
index cd6ae26..5b9d9fd 100644
--- a/etc/sitecfg/Makefile.in
+++ b/etc/sitecfg/Makefile.in
@@ -14,4 +14,7 @@ install:
 	$(INSTALL) -m 755 $(INSTALL_OPTS) auth.site.xml $(DESTDIR)$(prefix)/app/modules/AppKit/config/auth.site.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) cronks.site.xml $(DESTDIR)$(prefix)/app/modules/Cronks/config/cronks.site.xml
 	$(INSTALL) -m 755 $(INSTALL_OPTS) databases.site.xml $(DESTDIR)$(prefix)/app/config/databases.site.xml
-	$(INSTALL) -m 755 $(INSTALL_OPTS) icinga.site.xml $(DESTDIR)$(prefix)/app/config/icinga.site.xml
\ No newline at end of file
+	$(INSTALL) -m 755 $(INSTALL_OPTS) icinga.site.xml $(DESTDIR)$(prefix)/app/config/icinga.site.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) settings.site.xml $(DESTDIR)$(prefix)/app/config/settings.site.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) translation.site.xml $(DESTDIR)$(prefix)/app/config/translation.site.xml
+	$(INSTALL) -m 755 $(INSTALL_OPTS) factories.site.xml $(DESTDIR)$(prefix)/app/config/factories.site.xml
\ No newline at end of file
diff --git a/etc/sitecfg/factories.site.xml b/etc/sitecfg/factories.site.xml
new file mode 100755
index 0000000..ba14074
--- /dev/null
+++ b/etc/sitecfg/factories.site.xml
@@ -0,0 +1,15 @@
+<?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/factories/1.0">
+	
+	<ae:configuration >
+		<!--
+		* Example customize sessions 
+		<storage class="AppKitDoctrineSessionStorage">
+			<ae:parameter name="session_cookie_lifetime">3600</ae:parameter>
+			<ae:parameter name="session_name">icinga-web-CUSTOMISED</ae:parameter>
+			<ae:parameter name="gzip_level">6</ae:parameter>
+		</storage>
+		-->
+	</ae:configuration>
+	
+</ae:configurations>
\ No newline at end of file
diff --git a/etc/sitecfg/settings.site.xml b/etc/sitecfg/settings.site.xml
new file mode 100644
index 0000000..467f5f9
--- /dev/null
+++ b/etc/sitecfg/settings.site.xml
@@ -0,0 +1,12 @@
+<?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/settings/1.0">
+	<ae:configuration>
+		<!--
+		* Disable whole application
+		Example how to overwrite settings from settings.xml
+		<settings>
+			<setting name="available">false</setting>
+		</settings>
+		-->
+	</ae:configuration>
+</ae:configurations>
\ No newline at end of file
diff --git a/etc/sitecfg/translation.site.xml b/etc/sitecfg/translation.site.xml
new file mode 100755
index 0000000..22a9f97
--- /dev/null
+++ b/etc/sitecfg/translation.site.xml
@@ -0,0 +1,34 @@
+<?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/translation/1.0">
+ 	<ae:configuration>
+  
+  		<!--
+  		* Example to change locales
+  		Stripping down available languages and set one as default
+		 <available_locales default_locale="de" default_timezone="GMT">
+			<available_locale identifier="de_DE">
+			  <ae:parameter name="description">Deutsch</ae:parameter>
+			</available_locale>
+			<available_locale identifier="en">
+			  <ae:parameter name="description">English</ae:parameter>
+			</available_locale>
+		 </available_locales>
+		 -->
+		
+		<!-- 
+		* Example changing date formats
+		Changing the tstamp format for icinga grids
+		<translators default_domain="icinga.default">
+			<translator domain="date-tstamp">
+				<date_formatter>
+					<ae:parameter name="type">date</ae:parameter>
+					<ae:parameter name="format">yyyy-MM-dd</ae:parameter>
+				</date_formatter>
+			</translator>
+		</translators>
+		-->
+		
+	</ae:configuration>
+
+
+</ae:configurations>





More information about the icinga-checkins mailing list