Don't store the real database config in svn, instead store examples for Postgres and MySQL. (Reverting Edgemaster's silly revert.)

This commit is contained in:
Shaun McDonald 2009-05-21 14:45:16 +00:00
parent d4954bc7b1
commit 0d5136c1aa
2 changed files with 38 additions and 9 deletions

View file

@ -11,10 +11,10 @@
# And be sure to use new-style password hashing:
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
adapter: postgresql
adapter: mysql
database: openstreetmap
# username: openstreetmap
# password: openstreetmap
username: openstreetmap
password: openstreetmap
host: localhost
encoding: utf8
@ -22,17 +22,17 @@ development:
# re-generated from your development database when you run 'rake'.
# Do not set this db to the same as development or production.
test:
adapter: postgresql
adapter: mysql
database: osm_test
# username: osm_test
# password: osm_test
username: osm_test
password: osm_test
host: localhost
encoding: utf8
production:
adapter: postgresql
adapter: mysql
database: osm
# username: osm
# password: osm
username: osm
password: osm
host: localhost
encoding: utf8

View file

@ -0,0 +1,29 @@
# Postgresql version 8.3 recommended.
# See http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6/postgres for detailed setup instructions.
#
development:
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: postgresql
database: osm_test
# username: osm_test
# password: osm_test
host: localhost
encoding: utf8
production:
adapter: postgresql
database: osm
# username: osm
# password: osm
host: localhost
encoding: utf8