Don't store the real database config in svn, instead store examples for Postgres...
authorShaun McDonald <shaun@shaunmcdonald.me.uk>
Thu, 21 May 2009 14:45:16 +0000 (14:45 +0000)
committerShaun McDonald <shaun@shaunmcdonald.me.uk>
Thu, 21 May 2009 14:45:16 +0000 (14:45 +0000)
config/mysql.example.database.yml [moved from config/database.yml with 80% similarity]
config/postgres.example.database.yml [new file with mode: 0644]

similarity index 80%
rename from config/database.yml
rename to config/mysql.example.database.yml
index c6fe06fdd937ddb1af23b5097a5620fd0cbeb8c2..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
 # 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
   database: openstreetmap
-#  username: openstreetmap
-#  password: openstreetmap
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
   encoding: utf8
 
   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:
 # 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
   database: osm_test
-#  username: osm_test
-#  password: osm_test
+  username: osm_test
+  password: osm_test
   host: localhost
   encoding: utf8
 
 production:
   host: localhost
   encoding: utf8
 
 production:
-  adapter: postgresql
+  adapter: mysql
   database: osm
   database: osm
-#  username: osm
-#  password: osm
+  username: osm
+  password: osm
   host: localhost
   encoding: utf8
   host: localhost
   encoding: utf8
diff --git a/config/postgres.example.database.yml b/config/postgres.example.database.yml
new file mode 100644 (file)
index 0000000..3908e51
--- /dev/null
@@ -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