[icinga-checkins] icinga.org: icinga-web/cdoebler/default: * Some files to gitignore ( files from AC)

git at icinga.org git at icinga.org
Tue Jan 19 16:09:43 CET 2010


Module: icinga-web
Branch: cdoebler/default
Commit: 62cc2ce8b79c965108c7ddb3333e37f57f08e33f
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=62cc2ce8b79c965108c7ddb3333e37f57f08e33f

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jan 14 14:09:40 2010 +0100

* Some files to gitignore (files from AC)
* database.xml is now rewritten by AC

---

 .gitignore                                     |    5 +++++
 Makefile.in                                    |    3 ++-
 app/config/{databases.xml => databases.xml.in} |    6 +++---
 configure                                      |    3 ++-
 configure.ac                                   |    1 +
 doc/CHANGELOG                                  |    3 +++
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c397c2..15fb910 100755
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,9 @@ app/cache
 lib/icinga-api
 icinga-web.session
 icinga-web.webprj
+Makefile
+config.log
+config.status
+etc/build.properties
+app/config/databases.xml
 *~
diff --git a/Makefile.in b/Makefile.in
index a5b4360..fdb0535 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,7 +54,8 @@ distclean: clean
 		Makefile \
 		config.log \
 		config.status \
-		etc/build.properties
+		etc/build.properties \
+		app/config/databases.xml
 
 devclean: remove-temp-files distclean cacheclean install-files-list
 
diff --git a/app/config/databases.xml b/app/config/databases.xml.in
similarity index 80%
rename from app/config/databases.xml
rename to app/config/databases.xml.in
index 8d4b1a3..3176a2a 100755
--- a/app/config/databases.xml
+++ b/app/config/databases.xml.in
@@ -11,11 +11,11 @@
 					
 					http://www.doctrine-project.org/documentation/manual/1_1/en/introduction-to-connections
 				-->
-				<ae:parameter name="dsn">mysql://icinga_web:icinga_web@127.0.0.1:3306/icinga_web</ae:parameter>
+				<ae:parameter name="dsn">@db_type@://@db_user@:@db_pass@@@db_host@:@db_port@/@db_name@</ae:parameter>
 				
 				<!-- Generic credentials  -->
-				<!-- <ae:parameter name="username">icinga_web</ae:parameter>
-				<ae:parameter name="password">icinga_web</ae:parameter> -->
+				<!-- <ae:parameter name="username">@db_user@</ae:parameter> -->
+				<!-- <ae:parameter name="password">@db_pass@</ae:parameter> -->
 				
 				<!-- DB encoding type -->
 				<ae:parameter name="charset">utf8</ae:parameter>
diff --git a/configure b/configure
index 8088038..e59969e 100755
--- a/configure
+++ b/configure
@@ -2207,7 +2207,7 @@ CFLAGS=""
 
 
 
-ac_config_files="$ac_config_files Makefile etc/build.properties"
+ac_config_files="$ac_config_files Makefile etc/build.properties app/config/databases.xml"
 
 
 cat >confcache <<\_ACEOF
@@ -2907,6 +2907,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "etc/build.properties") CONFIG_FILES="$CONFIG_FILES etc/build.properties" ;;
+    "app/config/databases.xml") CONFIG_FILES="$CONFIG_FILES app/config/databases.xml" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index d2b1e4b..5e861b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,7 @@ AC_SUBST(INSTALL_OPTS)
 AC_CONFIG_FILES([
 	Makefile
 	etc/build.properties
+	app/config/databases.xml
 ])
 
 AC_OUTPUT
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index ec6b3e0..cd5668b 100755
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -74,4 +74,7 @@
       
     * 2010-01-14
       * Updated phing to stable version 2.3.3
+      * Added AC options for db installing
+      * AC rewrites build.properties for phing
+      * database.xml is now substituted by AC
       
\ No newline at end of file





More information about the icinga-checkins mailing list