--- src/config/database.pg | 56 +++++++++++++++++++++++++++++++++++++ src/config/database.yml | 70 +++++++++++++++------------------------------- 2 files changed, 79 insertions(+), 47 deletions(-) create mode 100644 src/config/database.pg
diff --git a/src/config/database.pg b/src/config/database.pg new file mode 100644 index 0000000..9be626c --- /dev/null +++ b/src/config/database.pg @@ -0,0 +1,56 @@ +# PostgresSQL. Versions 8.2 recommended. +# +# Fedora Install Instructions: +# sudo yum install ruby-postgres postgresql-server +# sudo /sbin/service postgresql initdb +# sudo /sbin/service postgresql start +# sudo su - postgres +# $ psql +# $-# CREATE USER dcloud WITH PASSWORD 'v23zj59an' CREATEDB; +# $-# \q +# $ exit +# +# To start off a new environment, use the following commands: +# +# rake db:drop:all +# rake db:create:all +# rake db:migrate (if you want production rather than the default of 'development', simply export RAILS_ENV=production before running this command) +# rake db:test:prepare +# +# And when there are changes to the database, simply run: +# +# rake db:migrate +# rake db:test:prepare +# for the environment you wish to update. +# +# On a local system you may need to edit this file to have only the following +# /var/lib/pgsql/data/pg_hba.conf +# local all all trust +# host all all 127.0.0.1 255.255.255.255 trust + + +development: + adapter: postgresql + database: dcloud_development + username: dcloud + password: v23zj59an + host: localhost + +# Warning: The database defined as 'test' will be erased and +# re-generated from your development database when you run 'rake test'. +# Do not set this db to the same as development or production. +test: + adapter: postgresql + database: dcloud_test + username: postgres + host: localhost + +production: + adapter: postgresql + database: dcloud + username: dcloud + password: v23zj59an + host: localhost + +cucumber: + <<: *TEST diff --git a/src/config/database.yml b/src/config/database.yml index 9be626c..5efe557 100644 --- a/src/config/database.yml +++ b/src/config/database.yml @@ -1,56 +1,32 @@ -# PostgresSQL. Versions 8.2 recommended. -# -# Fedora Install Instructions: -# sudo yum install ruby-postgres postgresql-server -# sudo /sbin/service postgresql initdb -# sudo /sbin/service postgresql start -# sudo su - postgres -# $ psql -# $-# CREATE USER dcloud WITH PASSWORD 'v23zj59an' CREATEDB; -# $-# \q -# $ exit -# -# To start off a new environment, use the following commands: -# -# rake db:drop:all -# rake db:create:all -# rake db:migrate (if you want production rather than the default of 'development', simply export RAILS_ENV=production before running this command) -# rake db:test:prepare -# -# And when there are changes to the database, simply run: -# -# rake db:migrate -# rake db:test:prepare -# for the environment you wish to update. -# -# On a local system you may need to edit this file to have only the following -# /var/lib/pgsql/data/pg_hba.conf -# local all all trust -# host all all 127.0.0.1 255.255.255.255 trust - +# SQLite version 3.x +# gem install sqlite3-ruby (not necessary on OS X Leopard) +# If you are running the aggregator from an rpm, and wish to use +# sqlite, you will need to mv this file to database.yml. The .sqlite3 file can be put +# in any location you desire, just update the relative paths below to point +# to the correct location. Also, you will need to take the following 2 steps: +# 1. Run rake db:migrate (as root) to create the db file and set it to be owned by the dcloud user +# 2. Make sure the dir that the above file lives in is also writable by this user. development: - adapter: postgresql - database: dcloud_development - username: dcloud - password: v23zj59an - host: localhost + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 -# Warning: The database defined as 'test' will be erased and -# re-generated from your development database when you run 'rake test'. +# 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: dcloud_test - username: postgres - host: localhost +test: &TEST + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 production: - adapter: postgresql - database: dcloud - username: dcloud - password: v23zj59an - host: localhost + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 cucumber: <<: *TEST -- 1.6.6.1 _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
