This patch also removes database.yml, so pointing the app at your db will now be a manual step. Directions will be added to the docs repo in getting_started.txt --- .gitignore | 1 + src/config/database.mysql | 2 +- src/config/database.pg | 56 +++++++++++++++++++++++++++++++++++++++++++++ src/config/database.yml | 56 --------------------------------------------- 4 files changed, 58 insertions(+), 57 deletions(-) create mode 100644 src/config/database.pg delete mode 100644 src/config/database.yml
diff --git a/.gitignore b/.gitignore index 9cfdd9f..89945f2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ ovirt-server*.gz ovirt-server.spec schema.rb log/ +database.yml diff --git a/src/config/database.mysql b/src/config/database.mysql index 3e39c57..10742bb 100644 --- a/src/config/database.mysql +++ b/src/config/database.mysql @@ -27,7 +27,7 @@ development: # 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: +test: &TEST adapter: mysql encoding: utf8 database: dc_test diff --git a/src/config/database.pg b/src/config/database.pg new file mode 100644 index 0000000..1932c3c --- /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: &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 deleted file mode 100644 index 1932c3c..0000000 --- a/src/config/database.yml +++ /dev/null @@ -1,56 +0,0 @@ -# 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: &TEST - adapter: postgresql - database: dcloud_test - username: postgres - host: localhost - -production: - adapter: postgresql - database: dcloud - username: dcloud - password: v23zj59an - host: localhost - -cucumber: - <<: *TEST -- 1.6.6.1 _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
