diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | env.in | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | lazystarter.sh.in (renamed from lazystarter.sh) | 14 |
4 files changed, 16 insertions, 9 deletions
@@ -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 b998fabd..3784fd42 100644 --- 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 index 9dc12088..00000000 --- a/env.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -our_python=@PYTHON@ - diff --git a/lazystarter.sh b/lazystarter.sh.in index 3a4efd25..218f738f 100755..100644 --- 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}" \ |