Merge 8377:8381 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index a972b44b376dc1123daa720d669a0f9b35bc53b6..19b5dd8d5227ae5c04720b61afd9a101661c9cbe 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,10 +12,9 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
-  database: openstreetmap
-  username: openstreetmap
-  password: openstreetmap
-  host: 128.40.58.203
+  database: osm
+  user: root  
+  host: localhost
 
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.
@@ -32,4 +31,5 @@ production:
   database: openstreetmap
   username: openstreetmap
   password: openstreetmap
-  host: 128.40.58.203
+  host: db.openstreetmap.org
+