X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15f23469d97b768501bac8b58081cb61bcdd8b4b..568c05c548773a222e6204e091342db6e76b62b3:/config/database.yml?ds=sidebyside

diff --git a/config/database.yml b/config/database.yml
index d366bc96b..cc3f9a1a5 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -12,10 +12,11 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
-  database: osm
+  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'.
@@ -23,13 +24,15 @@ development:
 test:
   adapter: mysql
   database: osm_test
-  username: root
-  password:
+  username: osm_test
+  password: osm_test
   host: localhost
+  encoding: utf8
 
 production:
   adapter: mysql
-  database: openstreetmap
-  username: openstreetmap
-  password: openstreetmap
-  host: db.openstreetmap.org
+  database: osm
+  username: osm
+  password: osm
+  host: localhost
+  encoding: utf8