From e75aa111e3caf8b7a1b5159073c62fc8f2ca63e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 4 Nov 2012 17:05:16 +0100
Subject: [PATCH] use foremans formation option and not the alias concurrency,
 start unicorn_rails instead of unicorn

---
 .foreman      | 2 +-
 Procfile      | 2 +-
 script/server | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.foreman b/.foreman
index b6eec508d..da229edb6 100644
--- a/.foreman
+++ b/.foreman
@@ -1,2 +1,2 @@
 port: 3000
-concurrency: web=1,worker=0
+formation: web=1,worker=0
diff --git a/Procfile b/Procfile
index a1ddfe5e0..999e5c582 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
-web: bundle exec unicorn -c config/unicorn.rb -p $PORT
+web: bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
 worker: env QUEUE=* bundle exec rake resque:work
diff --git a/script/server b/script/server
index 70e81dea9..ff42447a8 100755
--- a/script/server
+++ b/script/server
@@ -113,4 +113,4 @@ else
 fi
 echo ""
 
-bundle exec foreman start -c "web=1,worker=$workers" -p $port
+bundle exec foreman start -m "web=1,worker=$workers" -p $port