From 3e4dca03991bedf866a62f73a5dedab7db3c0db6 Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Wed, 22 Apr 2015 08:03:55 -0400
Subject: [PATCH] Revert "Trying passenger instead of puma"

This reverts commit 1fa79c9dc46408e738953408e916a902194ed680.
---
 Gemfile      | 2 +-
 Gemfile.lock | 7 +++----
 Procfile     | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index d164275..9e8a585 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ gem 'spring',        group: :development
 		gem 'rb-readline'
 		gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails'
 		gem 'jquery-ui-rails'
-		gem 'passenger'
+		gem 'puma'
 
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c41173..be9ba1e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -94,10 +94,9 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
-    passenger (5.0.6)
-      rack
-      rake (>= 0.8.1)
     pg (0.18.1)
+    puma (2.11.2)
+      rack (>= 1.1, < 2.0)
     rack (1.6.0)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -182,8 +181,8 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails
   mysql2
-  passenger
   pg
+  puma
   rails (= 4.2.0)
   rails_12factor
   rb-readline
diff --git a/Procfile b/Procfile
index cd10147..6bbd5ce 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
 worker: rake jobs:work
-web: bundle exec passenger -p $PORT
\ No newline at end of file
+web: bundle exec puma -t 5:5 -p $PORT -e $RAILS_ENV
\ No newline at end of file