From 6a7f9ce8130cb43706288e46b68d9b0f7a806adf Mon Sep 17 00:00:00 2001 From: Ábner Silva de Oliveira Date: Fri, 7 Feb 2014 16:31:29 -0300 Subject: [PATCH] changing to use postgresql database --- Gemfile | 6 +++++- config/database.yml | 11 ++++++++--- thin.yml | 14 ++++++++++++++ vendor/cache/eventmachine-1.0.3.gem | Bin 0 -> 225792 bytes vendor/cache/pg-0.17.1.gem | Bin 142848 -> 0 bytes vendor/cache/postgres-0.8.1.gem | Bin 7680 -> 0 bytes vendor/cache/thin-1.6.1.gem | Bin 0 -> 58368 bytes 7 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 thin.yml create mode 100644 vendor/cache/eventmachine-1.0.3.gem delete mode 100644 vendor/cache/pg-0.17.1.gem delete mode 100644 vendor/cache/postgres-0.8.1.gem create mode 100644 vendor/cache/thin-1.6.1.gem diff --git a/Gemfile b/Gemfile index 9ae84fd..cc3e51b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,11 @@ source 'https://www.rubygems.org' source "http://gems.github.com" -gem 'postgres' +gem 'thin' +#gem 'postgres', '~> 0.8.1' +#gem 'activerecord-pg-adapter' +gem 'pg', '~> 0.17.1' +gem 'activerecord-postgresql-adapter' gem "rake", "~> 0.9.2.2" gem "rdoc", "~> 3.12" gem "rails", "2.3.18" diff --git a/config/database.yml b/config/database.yml index e70d694..4abb3a6 100644 --- a/config/database.yml +++ b/config/database.yml @@ -2,15 +2,20 @@ # gem install sqlite3-ruby (not necessary on OS X Leopard) development: &default - adapter: mysql2 - database: rebirth_development + adapter: postgresql + database: pairwise_dev pool: 5 timeout: 5000 - + username: pairwise + password: pairwise + port: 5434 + host: 127.0.0.1 test: &test adapter: sqlite3 database: db/test.sqlite3 +production: + <<: *default cucumber: <<: *test diff --git a/thin.yml b/thin.yml new file mode 100644 index 0000000..75d4663 --- /dev/null +++ b/thin.yml @@ -0,0 +1,14 @@ +--- +pid: tmp/pids/thin.pid +address: 0.0.0.0 +timeout: 30 +wait: 30 +port: 5030 +log: log/thin.log +max_conns: 1024 +require: [] + +environment: production +max_persistent_conns: 512 +servers: 4 +daemonize: true diff --git a/vendor/cache/eventmachine-1.0.3.gem b/vendor/cache/eventmachine-1.0.3.gem new file mode 100644 index 0000000..ca7ddbb Binary files /dev/null and b/vendor/cache/eventmachine-1.0.3.gem differ diff --git a/vendor/cache/pg-0.17.1.gem b/vendor/cache/pg-0.17.1.gem deleted file mode 100644 index 3f29969..0000000 Binary files a/vendor/cache/pg-0.17.1.gem and /dev/null differ diff --git a/vendor/cache/postgres-0.8.1.gem b/vendor/cache/postgres-0.8.1.gem deleted file mode 100644 index 2be5861..0000000 Binary files a/vendor/cache/postgres-0.8.1.gem and /dev/null differ diff --git a/vendor/cache/thin-1.6.1.gem b/vendor/cache/thin-1.6.1.gem new file mode 100644 index 0000000..63d9b7e Binary files /dev/null and b/vendor/cache/thin-1.6.1.gem differ -- libgit2 0.21.2