X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4db3faa68cba0d7d570d11f9f8cac6d1f85afc70..d2c83d07d878fbe74e30c0f964933868046e86db:/config/database.yml diff --git a/config/database.yml b/config/database.yml index 363782953..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 - username: osm - password: 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,14 +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