From ccd42522f7cc3570fbee5049963ea41b65e1f703 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Sat, 16 May 2009 22:37:08 +0000 Subject: [PATCH 1/1] 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. --- config/mysql.example.database.yml | 38 ++++++++++++++++++++++++++++ config/postgres.example.database.yml | 29 +++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 config/mysql.example.database.yml create mode 100644 config/postgres.example.database.yml diff --git a/config/mysql.example.database.yml b/config/mysql.example.database.yml new file mode 100644 index 000000000..cc3f9a1a5 --- /dev/null +++ b/config/mysql.example.database.yml @@ -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 diff --git a/config/postgres.example.database.yml b/config/postgres.example.database.yml new file mode 100644 index 000000000..3908e51e5 --- /dev/null +++ b/config/postgres.example.database.yml @@ -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 -- 2.43.2