Merge branch '905-activities'

[mediagoblin.git] / lazystarter.sh

diff --git a/lazystarter.sh b/lazystarter.sh
index d3770194cd33059eab1e28e950fd3d53dfd3c30b..3a4efd25bb47a5cdaebcc35660daa0aa540a8b62 100755 (executable)
--- a/lazystarter.sh
+++ b/lazystarter.sh
@@ -20,7 +20,7 @@ selfname=$(basename "$0")
 local_bin="./bin"
 case "$selfname" in
     lazyserver.sh)
-        starter_cmd=paster
+        starter_cmd=gunicorn
         ini_prefix=paste
         ;;
     lazycelery.sh)
@@ -36,9 +36,8 @@ esac
 if [ "$1" = "-h" ]; then
     echo "$0 [-h] [-c filename.ini] [ARGS_to_${starter_cmd} ...]"
     echo ""
-    echo "   For example:"
-    echo "         $0 -c fcgi.ini port_number=23371"
-    echo "     or: $0 --server-name=fcgi --log-file=paste.log"
+    echo "   For Gunicorn settings, see at:"
+    echo "      http://docs.gunicorn.org/en/19.0/settings.html"
     echo ""
     echo "   The configfile defaults to ${ini_prefix}_local.ini,"
     echo "   if that is readable, otherwise ${ini_prefix}.ini."
@@ -71,12 +70,12 @@ set -x
 export CELERY_ALWAYS_EAGER=true
 case "$selfname" in
     lazyserver.sh)
-        $starter serve "$ini_file" "$@" --reload
+        $starter --paste "$ini_file" --log-file=- $@
         ;;
     lazycelery.sh)
         MEDIAGOBLIN_CONFIG="${ini_file}" \
             CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery \
-            $starter "$@"
+            $starter -B "$@"
         ;;
     *) exit 1 ;;
 esac