Update lazyserver to use paste or gunicorn conditionally

Also get rid of env.in, we're not using that for now.

diff --git a/.gitignore b/.gitignore
index 851805a09db222cc4afe9a9a55218a6b90ccc9c5..bec063ded0c346ce30ad6dedec83d9695e70ccb1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@
 /env
 /paste.ini
 /mediagoblin.ini
+/lazystarter.sh
 
 # pyconfigure/automake generated files
 /Makefile

diff --git a/configure.ac b/configure.ac
index b998fabdd5c03a9e04a0c3fa6cdbad226776954e..3784fd4296cf0a508f7c6b3676c9709c5fc4100e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,12 +80,12 @@ AC_ARG_WITH([python3],
        [with_python3=no])
 AS_IF([test "x$with_python3" != xno],
         AC_CHECK_PROGS([PYTHON], [python3.3], [none])
-        AC_SUBST([USE_PYTHON3], [yes])
+        AC_SUBST([USE_PYTHON3], [true])
        AS_IF([test "x$PYTHON" = xnone],
               [AC_MSG_FAILURE(
                [--with-python3 given but no acceptable python3 (3.3) could be found])]),
       AC_CHECK_PROGS([PYTHON], [python2.7 python2.6], [none])
-      AC_SUBST([USE_PYTHON3], [no])
+      AC_SUBST([USE_PYTHON3], [false])
       AS_IF([test "x$PYTHON" = xnone],
               [AC_MSG_FAILURE(
                [No acceptable python (2.7, 2.6) could be found])]))
@@ -435,7 +435,7 @@ dnl#########
 
 dnl Define the files to be configured
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([env], [chmod +x env])
+AC_CONFIG_FILES([lazystarter.sh], [chmod +x lazystarter.sh])
 
 dnl Generate config.status
 AC_OUTPUT

diff --git a/env.in b/env.in
deleted file mode 100644 (file)
index 9dc1208..0000000
--- a/env.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-our_python=@PYTHON@
-

diff --git a/lazystarter.sh b/lazystarter.sh.in
old mode 100755 (executable)
new mode 100644 (file)
similarity index 88%
rename from lazystarter.sh
rename to lazystarter.sh.in
index 3a4efd2..218f738
--- a/lazystarter.sh
+++ b/lazystarter.sh.in
@@ -16,11 +16,17 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+use_python3=@USE_PYTHON3@
+
 selfname=$(basename "$0")
 local_bin="./bin"
 case "$selfname" in
     lazyserver.sh)
-        starter_cmd=gunicorn
+        if $use_python3; then
+            starter_cmd=gunicorn;
+        else
+            starter_cmd=paster;
+        fi
         ini_prefix=paste
         ;;
     lazycelery.sh)
@@ -70,7 +76,11 @@ set -x
 export CELERY_ALWAYS_EAGER=true
 case "$selfname" in
     lazyserver.sh)
-        $starter --paste "$ini_file" --log-file=- $@
+        if $use_python3; then
+            $starter --paste "$ini_file" --log-file=- $@;
+        else
+            $starter serve "$ini_file" "$@" --reload;
+        fi
         ;;
     lazycelery.sh)
         MEDIAGOBLIN_CONFIG="${ini_file}" \