[DRE-commits] [SCM] unicorn.git branch, master, updated. upstream/4.2.1-24-g989e903

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit def595dd31e44f76f4c26fb328a250976c246238
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sun May 13 11:18:16 2012 +0300

    Update unicorn.default and unicorn.init
    
      * unicorn.default:
        - Add more explanations of used options
        - Add avriable for server's config.rb
      * unicorn.init:
        - Remove usage of unnecessary variable TIMEOUT

diff --git a/debian/unicorn.default b/debian/unicorn.default
index d61237a..00e5148 100644
--- a/debian/unicorn.default
+++ b/debian/unicorn.default
@@ -1,14 +1,19 @@
-# Change paramentres below to appropriate values and set CONFIGURED to yes
+# Change paramentres below to appropriate values and set CONFIGURED to yes.
 CONFIGURED=no
 
-# Default timeout until child process is killed
+# Default timeout until child process is killed during server upgrade,
+# it has *no* relation to option "timeout" in server's config.rb.
 TIMEOUT=60
 
-# Path to your web application
+# Path to your web application, sh'ld be also set in server's config.rb,
+# option "working_directory". Rack's config.ru is located here.
 APP_ROOT=/path/to/your/web/application
 
-# Where to store PID, sh'ld be also set in server's config.rb
+# Server's config.rb, it's not a rack's config.ru
+CONFIG_RB="$APP_ROOT/unicorn.conf.rb"
+
+# Where to store PID, sh'ld be also set in server's config.rb, option "pid".
 PID=/run/unicorn.pid
 
-# Additional arguments passed to unicorn, see man 1 unicorn
-UNICORN_OPTS="-D -c $APP_ROOT/config/unicorn.rb"
+# Additional arguments passed to unicorn, see man (1) unicorn.
+UNICORN_OPTS="-D -c $CONFIG_RB"
diff --git a/debian/unicorn.init b/debian/unicorn.init
index 489ca68..0fc4788 100644
--- a/debian/unicorn.init
+++ b/debian/unicorn.init
@@ -21,7 +21,6 @@ if [ -f /etc/default/unicorn ]; then
 fi
 
 DAEMON=/usr/bin/unicorn
-TIMEOUT=${TIMEOUT-60}
 PID=${PID-/run/unicorn.pid}
 
 run_by_init() {

-- 
unicorn.git