Move unicorn definition to main Gemfile

.gitignore

@@ -68,7 +68,7 @@
 /*.rbc
 /doc/app
 #/Gemfile.lock
-#/Gemfile.local
+/Gemfile.local
 /Gemfile.plugins
 /.rvmrc*
 /.ruby-version

.pkgr.yml

@@ -8,7 +8,7 @@ targets:
     dependencies:
       - debconf
       - memcached
-before_precompile: "./packaging/debian/setup.sh"
+before_precompile: "packaging/setup"
 after_install: "packaging/debian/postinst"
 addons:
   - mysql

Gemfile

@@ -131,6 +131,9 @@ gem "i18n-js", :git => "https://github.com/fnando/i18n-js.git", :ref => '8801f8d
 # small wrapper around the command line
 gem 'cocaine'
 
+# required by Procfile, for deployment on heroku or packaging with packager.io.
+# also, better than thin since we can control worker concurrency.
+gem 'unicorn'
 
 # Security fixes
 # Gems we don't depend directly on, but specify here to make sure we don't use a vulnerable

Gemfile.local

@@ -1,6 +0,0 @@
-ruby '2.1.1'
-group :production do
-  gem 'rails_12factor'
-  gem 'unicorn'
-end
-

Gemfile.lock

@@ -252,13 +252,8 @@ GEM
     rails-dev-tweaks (0.6.1)
       actionpack (~> 3.1)
       railties (~> 3.1)
-    rails_12factor (0.0.2)
-      rails_serve_static_assets
-      rails_stdout_logging
     rails_autolink (1.1.0)
       rails (> 3.1)
-    rails_serve_static_assets (0.0.2)
-    rails_stdout_logging (0.0.3)
     railties (3.2.19)
       actionpack (= 3.2.19)
       activesupport (= 3.2.19)
@@ -428,7 +423,6 @@ DEPENDENCIES
   rack_session_access
   rails (~> 3.2.19)
   rails-dev-tweaks (~> 0.6.1)
-  rails_12factor
   rails_autolink
   rb-fsevent
   rb-readline

packaging/setup

@@ -4,5 +4,5 @@
 # see: https://packager.io/documentation
 sudo service postgresql start
 
-cp -f packaging/debian/conf/configuration.yml config/configuration.yml
+cp -f packaging/conf/configuration.yml config/configuration.yml