# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1346078657 25200
# Node ID 8c0f70f8249e73b79008544e9d36effaccdc19a9
# Parent  0d68bfd359717583edb419f8cfd8a4c7c1c01e83
Added webservers - puma and unicorn.

diff -r 0d68bfd35971 -r 8c0f70f8249e Gemfile
--- a/Gemfile	Sun Aug 26 20:02:41 2012 -0700
+++ b/Gemfile	Mon Aug 27 07:44:17 2012 -0700
@@ -26,7 +26,8 @@
 # gem 'jbuilder'
 
 # Use unicorn as the app server
-# gem 'unicorn'
+gem 'unicorn', :platforms => :mri
+gem 'puma', :platforms => [:rbx, :jruby]
 
 # Deploy with Capistrano
 # gem 'capistrano'
diff -r 0d68bfd35971 -r 8c0f70f8249e Gemfile.lock
--- a/Gemfile.lock	Sun Aug 26 20:02:41 2012 -0700
+++ b/Gemfile.lock	Mon Aug 27 07:44:17 2012 -0700
@@ -37,6 +37,7 @@
     i18n (0.6.0)
     journey (1.0.4)
     json (1.7.5)
+    kgio (2.7.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -45,6 +46,8 @@
     multi_json (1.3.6)
     mysql2 (0.3.11)
     polyglot (0.3.3)
+    puma (1.6.1)
+      rack (~> 1.2)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -67,6 +70,7 @@
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
+    raindrops (0.10.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -88,6 +92,10 @@
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
+    unicorn (4.3.1)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
 
 PLATFORMS
   ruby
@@ -95,6 +103,8 @@
 DEPENDENCIES
   json
   mysql2
+  puma
   rails (= 3.2.8)
   sass-rails (~> 3.2.3)
   uglifier (>= 1.0.3)
+  unicorn