From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Thu, 21 May 2009 14:45:16 +0000 (+0000)
Subject: Don't store the real database config in svn, instead store examples for Postgres... 
X-Git-Tag: live~7416
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0d5136c1aa9426061531ee0eee8de13f14fb8622

Don't store the real database config in svn, instead store examples for Postgres and MySQL. (Reverting Edgemaster's silly revert.)
---

diff --git a/config/database.yml b/config/mysql.example.database.yml
similarity index 80%
rename from config/database.yml
rename to config/mysql.example.database.yml
index c6fe06fdd..cc3f9a1a5 100644
--- a/config/database.yml
+++ b/config/mysql.example.database.yml
@@ -11,10 +11,10 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: postgresql
+  adapter: mysql
   database: openstreetmap
-#  username: openstreetmap
-#  password: openstreetmap
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
   encoding: utf8
 
@@ -22,17 +22,17 @@ development:
 # re-generated from your development database when you run 'rake'.
 # Do not set this db to the same as development or production.
 test:
-  adapter: postgresql
+  adapter: mysql
   database: osm_test
-#  username: osm_test
-#  password: osm_test
+  username: osm_test
+  password: osm_test
   host: localhost
   encoding: utf8
 
 production:
-  adapter: postgresql
+  adapter: mysql
   database: osm
-#  username: osm
-#  password: osm
+  username: osm
+  password: osm
   host: localhost
   encoding: utf8
diff --git a/config/postgres.example.database.yml b/config/postgres.example.database.yml
new file mode 100644
index 000000000..3908e51e5
--- /dev/null
+++ b/config/postgres.example.database.yml
@@ -0,0 +1,29 @@
+# Postgresql version 8.3 recommended.
+# See http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6/postgres for detailed setup instructions.
+#
+development:
+  adapter: postgresql
+  database: openstreetmap
+#  username: openstreetmap
+#  password: openstreetmap
+  host: localhost
+  encoding: utf8
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  database: osm_test
+#  username: osm_test
+#  password: osm_test
+  host: localhost
+  encoding: utf8
+
+production:
+  adapter: postgresql
+  database: osm
+#  username: osm
+#  password: osm
+  host: localhost
+  encoding: utf8