X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/914b358154479adf295e8ef794787f07aee50c3d..4e8ed960a7aaffca8feb7a676d2f858c8aa4ba00:/config/database.yml?ds=sidebyside diff --git a/config/database.yml b/config/database.yml index b44b9823a..cc3f9a1a5 100644 --- a/config/database.yml +++ b/config/database.yml @@ -16,6 +16,7 @@ development: 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: 128.40.58.203 + database: osm + username: osm + password: osm + host: localhost + encoding: utf8