X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15f23469d97b768501bac8b58081cb61bcdd8b4b..2c52b067168084265ed577104fe1fa2677c6e620:/config/database.yml diff --git a/config/database.yml b/config/database.yml index d366bc96b..2c61345b1 100644 --- a/config/database.yml +++ b/config/database.yml @@ -11,25 +11,28 @@ # And be sure to use new-style password hashing: # http://dev.mysql.com/doc/refman/5.0/en/old-client.html development: - adapter: mysql - database: osm - username: openstreetmap - password: openstreetmap - host: localhost + adapter: postgresql + database: openstreetmap + username: shaunmcdonald + password: postgres + #host: localhost + encoding: utf8 # Warning: The database defined as 'test' will be erased and # re-generated from your development database when you run 'rake'. # Do not set this db to the same as development or production. test: - adapter: mysql + adapter: postgresql database: osm_test - username: root - password: - host: localhost + username: shaunmcdonald + password: postgres + #host: localhost + encoding: utf8 production: - adapter: mysql - database: openstreetmap - username: openstreetmap - password: openstreetmap - host: db.openstreetmap.org + adapter: postgresql + database: osm + username: osm + password: osm + host: localhost + encoding: utf8