diff options
| author | Tyler Mercier <tylermercier@gmail.com> | 2013-06-18 17:06:27 -0600 |
|---|---|---|
| committer | Tyler Mercier <tylermercier@gmail.com> | 2013-06-18 17:06:27 -0600 |
| commit | 40ae00a6e5fbd2cb2d7c6413ab494d703e578347 (patch) | |
| tree | 591738bae89379f68ee10c46edd6013f58d552ac | |
| parent | ff62aa4edfd34494246eb84028cd7a61a1f2f326 (diff) | |
Revert "Revert "Revert "switch to thin"""
This reverts commit 17dad32d205dd20dac1c669add4b2724ae21842a.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 14 | ||||
| -rw-r--r-- | Procfile | 1 |
3 files changed, 9 insertions, 8 deletions
@@ -35,7 +35,7 @@ group :assets do end group :production do - gem 'thin' + gem 'unicorn' gem 'newrelic_rpm' gem 'dalli' gem 'ffaker' diff --git a/Gemfile.lock b/Gemfile.lock index 828b5a4..371684f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,7 +49,6 @@ GEM coffee-script-source execjs coffee-script-source (1.6.2) - daemons (1.1.9) dalli (2.6.4) devise (2.2.4) bcrypt-ruby (~> 3.0) @@ -61,7 +60,6 @@ GEM dotenv-rails (0.7.0) dotenv (= 0.7.0) erubis (2.7.0) - eventmachine (1.0.3) excon (0.23.0) execjs (1.4.0) multi_json (~> 1.0) @@ -92,6 +90,7 @@ GEM kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + kgio (2.8.0) lol_dba (1.5.0) actionpack (>= 3.0) activerecord (>= 3.0) @@ -139,6 +138,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) + raindrops (0.11.0) rake (10.0.4) rdoc (3.12.2) json (~> 1.4) @@ -167,10 +167,6 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.7) - thin (1.5.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) thor (0.18.1) tilt (1.4.1) treetop (1.4.14) @@ -180,6 +176,10 @@ GEM uglifier (2.1.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) + unicorn (4.6.2) + kgio (~> 2.6) + rack + raindrops (~> 0.7) uniform_notifier (1.2.0) warden (1.2.1) rack (>= 1.0) @@ -212,5 +212,5 @@ DEPENDENCIES rspec-rails sass-rails (~> 3.2.3) sqlite3 - thin uglifier (>= 1.0.3) + unicorn diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..9c82374 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb |