Merge branch 'master' into migrator-pr

2019-05-16 16:49:15 +01:00
parent 4455fa48c4 148e9e8629
commit b365d12a2e
40 changed files with 1442 additions and 998 deletions
@@ -29,7 +29,7 @@ cd $DAEMON_DIR

 start() {
        echo -n $"Starting $DESC ($NAME): "
-        daemon --check $NAME $PYTHON $DAEMON_DIR/web2py.py -Q --nogui -a $ADMINPASS -d $PIDFILE -p $PORT &
+        daemon --check $NAME $PYTHON $DAEMON_DIR/web2py.py -Q --no_gui -a $ADMINPASS -d $PIDFILE -p $PORT &
        RETVAL=$?
        if [ $RETVAL -eq 0 ]; then
                touch /var/lock/subsys/$NAME