cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Back out the stupid change.

Browse source
This commit is contained in:
Thomas Wood 2009-05-16 22:46:42 +00:00
parent c424fa0ee5
commit 0f46c39257
2 changed files with 9 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config/mysql.example.database.yml → config/database.yml
View file

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

29
config/postgres.example.database.yml
View file

@ -1,29 +0,0 @@
# 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