Add a global timeout that is applied to most API requests.

[rails.git] / config / database.yml

diff --git a/config/database.yml b/config/database.yml
index 0fbfce31921013399d66573fc4a623836a71e3eb..c6fe06fdd937ddb1af23b5097a5620fd0cbeb8c2 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -11,26 +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: osm
-  password: osm
+  adapter: postgresql
+  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'.
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
+  adapter: postgresql
   database: osm_test
-  username: osm_test
-  password: osm_test
+#  username: osm_test
+#  password: osm_test
   host: localhost
+  encoding: utf8
 
 production:
-  adapter: mysql
+  adapter: postgresql
   database: osm
-  username: osm
-  password: osm
+#  username: osm
+#  password: osm
   host: localhost
-
+  encoding: utf8