From 7d6a94d35853c2671ef2b5b0e423e0f7ad01025f Mon Sep 17 00:00:00 2001
From: Cyril Rohr <cyril.rohr@gmail.com>
Date: Mon, 28 Jul 2014 14:44:38 +0000
Subject: [PATCH] Move unicorn definition to main Gemfile

---
 .gitignore                                    | 2 +-
 .pkgr.yml                                     | 2 +-
 Gemfile                                       | 3 +++
 Gemfile.local                                 | 6 ------
 Gemfile.lock                                  | 6 ------
 packaging/{debian => }/conf/configuration.yml | 0
 packaging/{debian/setup.sh => setup}          | 2 +-
 7 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 Gemfile.local
 rename packaging/{debian => }/conf/configuration.yml (100%)
 rename packaging/{debian/setup.sh => setup} (66%)
 mode change 100644 => 100755

diff --git a/.gitignore b/.gitignore
index 041dd2072bb..59b9124664b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,7 +68,7 @@
 /*.rbc
 /doc/app
 #/Gemfile.lock
-#/Gemfile.local
+/Gemfile.local
 /Gemfile.plugins
 /.rvmrc*
 /.ruby-version
diff --git a/.pkgr.yml b/.pkgr.yml
index 0fef068ad1d..e9e8347b49d 100644
--- a/.pkgr.yml
+++ b/.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
diff --git a/Gemfile b/Gemfile
index 4cb332fb537..3f35c9a435f 100644
--- a/Gemfile
+++ b/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
diff --git a/Gemfile.local b/Gemfile.local
deleted file mode 100644
index d12abe45d48..00000000000
--- a/Gemfile.local
+++ /dev/null
@@ -1,6 +0,0 @@
-ruby '2.1.1'
-group :production do
-  gem 'rails_12factor'
-  gem 'unicorn'
-end
-
diff --git a/Gemfile.lock b/Gemfile.lock
index 819ee098efe..32bc8638373 100644
--- a/Gemfile.lock
+++ b/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
diff --git a/packaging/debian/conf/configuration.yml b/packaging/conf/configuration.yml
similarity index 100%
rename from packaging/debian/conf/configuration.yml
rename to packaging/conf/configuration.yml
diff --git a/packaging/debian/setup.sh b/packaging/setup
old mode 100644
new mode 100755
similarity index 66%
rename from packaging/debian/setup.sh
rename to packaging/setup
index 869265724eb..fc066fef437
--- a/packaging/debian/setup.sh
+++ b/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