[icinga-checkins] icinga.org: icinga-web/master: * Cleaned up default configs ( comment separations, default db settings)

git at icinga.org git at icinga.org
Fri Aug 26 14:39:58 CEST 2011


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

Author: Jannis Moßhammer <jannis.mosshammer at netways.de>
Date:   Fri Aug 26 12:44:36 2011 +0200

* Cleaned up default configs (comment separations, default db settings)

---

 etc/sitecfg/access.xml        |    3 ++-
 etc/sitecfg/cronks.xml        |    8 +++++---
 etc/sitecfg/databases.xml     |   12 ++++++++----
 etc/sitecfg/settings.site.xml |    2 ++
 etc/sitecfg/translation.xml   |    4 ++++
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/etc/sitecfg/access.xml b/etc/sitecfg/access.xml
index b183700..b16d2e7 100644
--- a/etc/sitecfg/access.xml
+++ b/etc/sitecfg/access.xml
@@ -92,7 +92,8 @@
 
     <!--
               This is experimental, try to avoid password encrypted keyfiles when encountering errors
-              Example for ssh connection with pubkey auth -->					
+              Example for ssh connection with pubkey auth 
+    -->					
     <!--	
             <host name="vm_host2">
                 <type>ssh</type>
diff --git a/etc/sitecfg/cronks.xml b/etc/sitecfg/cronks.xml
index f67d01c..bfcfadb 100644
--- a/etc/sitecfg/cronks.xml
+++ b/etc/sitecfg/cronks.xml
@@ -4,7 +4,8 @@
 		<cronks>
 	    <!-- 
             Cronk overwrites - for example 
-			
+        -->
+        <!--
             <cronk name="gridHostgroupSummary">
 				<ae:parameter name="module">Cronks</ae:parameter>
 				<ae:parameter name="action">System.ViewProc</ae:parameter>
@@ -23,14 +24,15 @@
         <categories>
         <!--
             Category overwrites - for example:
-        			
+        -->
+        <!--
 			<category name="misc">
 				<ae:parameter name="title">Misc</ae:parameter>
 				<ae:parameter name="visible">true</ae:parameter>
 				<ae:parameter name="position">99</ae:parameter>
 			</category>
 	
-            -->
+         -->
         </categories>
 	</ae:configuration>
 </ae:configurations>
diff --git a/etc/sitecfg/databases.xml b/etc/sitecfg/databases.xml
index 43e5884..69ba067 100644
--- a/etc/sitecfg/databases.xml
+++ b/etc/sitecfg/databases.xml
@@ -8,8 +8,10 @@
 <databases xmlns:db="http://agavi.org/agavi/config/parts/databases/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
 
 
-    <!-- Overwrite the icinga-web database (where users, roles, views, etc are stored 
-    EXAMPLE (oracle need icingaOracle as the db driver 
+    <!-- 
+    Overwrite the icinga-web database (where users, roles, views, etc are stored 
+    -->
+    <!--
     <db:database name="icinga_web" class="AppKitDoctrineDatabase">
         <ae:parameter name="dsn">mysql://icinga_web:icinga_web@localhost:3306/icinga_web</ae:parameter>
         <ae:parameter name="charset">utf8</ae:parameter>
@@ -36,9 +38,11 @@
     <!-- 
         Overwrite the default database conneciton for icinga data retrieval
         Make sure to use IcingaDoctrineDatabase, otherwise the use_retained parameter will be ignored
-       
+        EXAMPLE (oracle needs icingaOracle as the db driver) 
+    -->
+    <!--
     <db:database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="IcingaDoctrineDatabase">
-        <ae:parameter name="dsn">mysql://icinga_test:test@localhost:3306/icinga_test</ae:parameter>
+        <ae:parameter name="dsn">mysql://icinga:icinga@localhost:3306/icinga</ae:parameter>
         <ae:parameter name="prefix">icinga_</ae:parameter>
         <ae:parameter name="charset">utf8</ae:parameter>
          <ae:parameter name="use_retained">true</ae:parameter>
diff --git a/etc/sitecfg/settings.site.xml b/etc/sitecfg/settings.site.xml
index 467f5f9..81cb082 100644
--- a/etc/sitecfg/settings.site.xml
+++ b/etc/sitecfg/settings.site.xml
@@ -4,6 +4,8 @@
 		<!--
 		* Disable whole application
 		Example how to overwrite settings from settings.xml
+        -->
+        <!--
 		<settings>
 			<setting name="available">false</setting>
 		</settings>
diff --git a/etc/sitecfg/translation.xml b/etc/sitecfg/translation.xml
index 22a9f97..a599e14 100755
--- a/etc/sitecfg/translation.xml
+++ b/etc/sitecfg/translation.xml
@@ -5,6 +5,8 @@
   		<!--
   		* 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>
@@ -18,6 +20,8 @@
 		<!-- 
 		* Example changing date formats
 		Changing the tstamp format for icinga grids
+        -->
+        <!--
 		<translators default_domain="icinga.default">
 			<translator domain="date-tstamp">
 				<date_formatter>





More information about the icinga-checkins mailing list