]> git.openstreetmap.org Git - rails.git/blobdiff - config/database.yml
Remove explicit load of mysql and rails automatically loads the
[rails.git] / config / database.yml
index b884f3b938fea8c5ea541e0d4af5fbbc16529dd7..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
@@ -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,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