Merged 8899:9136 and 9145 from trunk.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index 93e3cf00eabd9f0aefccb08ca77a8d6b88266924..b884f3b938fea8c5ea541e0d4af5fbbc16529dd7 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,8 +13,8 @@
 development:
   adapter: mysql
   database: openstreetmap
-  username: TheUsername
-  password: ThePassword
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and
@@ -30,6 +30,7 @@ test:
 production:
   adapter: mysql
   database: openstreetmap
-  username: TheUsername
-  password: ThePassword
-  host: localhost
+  username: openstreetmap
+  password: openstreetmap
+  host: db.openstreetmap.org
+