Database config changes to hopefully stop people from accidently commiting database.yml. (As recommended by Shaun)

I'll back this out if it doesn't work nicely with what's on dev.
This commit is contained in:
Thomas Wood 2009-05-16 22:37:08 +00:00
parent 1a172c3ede
commit ccd42522f7
2 changed files with 67 additions and 0 deletions

View file

@ -0,0 +1,38 @@
# MySQL (default setup). Versions 4.1 and 5.0 are recommended.
#
# Install the MySQL driver:
# gem install mysql
# On MacOS X:
# gem install mysql -- --include=/usr/local/lib
# On Windows:
# There is no gem for Windows. Install mysql.so from RubyForApache.
# http://rubyforge.org/projects/rubyforapache
#
# 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: 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
database: osm_test
username: osm_test
password: osm_test
host: localhost
encoding: utf8
production:
adapter: mysql
database: 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