diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 11 insertions, 15 deletions
@@ -640,7 +640,7 @@ LIBOBJS DJANGO_ADMIN DJANGO_DIR SECRET_KEY -WEBUSER +VIRTUAL_ENV OPENSSL_SO_GLOB OPENSSL_CONFIG_COMMAND RPKID_SUBDIRS @@ -4929,21 +4929,17 @@ fi if test $build_django = yes then - # the user that the apache process is running as - if test "x$WEBUSER" = "x"; then - for u in apache www-data www; do - if $GREP $u /etc/passwd >/dev/null 2>&1; then - WEBUSER=$u - break - fi - done - if test "x$WEBUSER" = "x"; then - { { $as_echo "$as_me:$LINENO: error: Could not determine which user the apache process runs as. Please specify WEBUSER=<USERNAME>." >&5 -$as_echo "$as_me: error: Could not determine which user the apache process runs as. Please specify WEBUSER=<USERNAME>." >&2;} - { (exit 1); exit 1; }; } - fi - fi + { $as_echo "$as_me:$LINENO: checking if running under virtualenv" >&5 +$as_echo_n "checking if running under virtualenv... " >&6; } + if test x$VIRTUAL_ENV != x; then + VIRTUAL_ENV=$VIRTUAL_ENV + { $as_echo "$as_me:$LINENO: result: $VIRTUAL_ENV" >&5 +$as_echo "$VIRTUAL_ENV" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi # source: http://blog.leosoto.com/2008/04/django-secretkey-generation.html SECRET_KEY=`$PYTHON -c 'import random; print "".join(random.choice("abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)") for i in range(50))'` |