fix accidental commit of local config changes

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index 44bb1eacef2d80e2c508d4cc5ed82497353f76d7..cc3f9a1a5fb26e4fd5b2186728c3e4d5c6b45127 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,9 +13,10 @@
 development:
   adapter: mysql
   database: openstreetmap
-  username: freemap
-  password: BPaNCyU4
+  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: freemap
-  password: BPaNCyU4
+  database: osm
+  username: osm
+  password: osm
   host: localhost
+  encoding: utf8