X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8c5638d6968be3286414f04b8dee2261ada84e76..d3c60874092c63b493818f227f31027327b595e3:/config/database.yml diff --git a/config/database.yml b/config/database.yml index c0b5dd98c..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,9 +24,10 @@ development: test: adapter: mysql database: osm_test - username: root - password: + username: osm_test + password: osm_test host: localhost + encoding: utf8 production: adapter: mysql @@ -33,4 +35,4 @@ production: username: osm password: osm host: localhost - + encoding: utf8