1.1 --- a/INSTALL.mkd	Wed Apr 15 12:26:31 2015 +0200
     1.2 +++ b/INSTALL.mkd	Wed Apr 15 12:27:54 2015 +0200
     1.3 @@ -17,9 +17,10 @@
     1.4    * postgresql
     1.5    * libpq-dev
     1.6    * lighttpd (only for WebMCP 1.2.x support)
     1.7 +  * pmake or bmake (only for WebMCP 2.x with Moonbridge)
     1.8    * imagemagick
     1.9    * exim4
    1.10 -  * markdown2 (install with Python's pip)
    1.11 +  * markdown2 (``apt-get install python-pip; pip install markdown2``)
    1.12  
    1.13  If you're using any other Linux distribution or BSD system, install the
    1.14  necessary software components accordingly.
    1.15 @@ -33,14 +34,8 @@
    1.16  executing PostgreSQL's shell command `createuser` as database superuser
    1.17  (usually `pgsql`, or `postgres` for Debian installations):
    1.18  
    1.19 -    su - postgres
    1.20 -    createuser
    1.21 -
    1.22 -    Enter name of role to add: www-data
    1.23 -    Shall the new role be a superuser? (y/n) n
    1.24 -    Shall the new role be allowed to create databases? (y/n) y
    1.25 -    Shall the new role be allowed to create more new roles? (y/n) n
    1.26 -
    1.27 +    su postgres -s $SHELL
    1.28 +    createuser --no-superuser --createdb --no-createrole www-data
    1.29      exit
    1.30  
    1.31  
    1.32 @@ -59,7 +54,7 @@
    1.33      make
    1.34      mkdir /opt/liquid_feedback_core
    1.35      cp core.sql lf_update lf_update_issue_order /opt/liquid_feedback_core
    1.36 -    su - www-data
    1.37 +    su www-data -s $SHELL
    1.38      cd /opt/liquid_feedback_core
    1.39      createdb liquid_feedback
    1.40      createlang plpgsql liquid_feedback  # command may be omitted, depending on PostgreSQL version
    1.41 @@ -225,9 +220,9 @@
    1.42      echo "${PID}" > "${PIDFILE}"
    1.43  
    1.44      while true; do
    1.45 -      su - www-data -c 'nice /opt/liquid_feedback_core/lf_update dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
    1.46 -      su - www-data -c 'nice /opt/liquid_feedback_core/lf_update_issue_order dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
    1.47 -      su - www-data -c 'nice /opt/liquid_feedback_core/lf_update_suggestion_order dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
    1.48 +      su - www-data -s /bin/sh -c 'nice /opt/liquid_feedback_core/lf_update dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
    1.49 +      su - www-data -s /bin/sh -c 'nice /opt/liquid_feedback_core/lf_update_issue_order dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
    1.50 +      su - www-data -s /bin/sh -c 'nice /opt/liquid_feedback_core/lf_update_suggestion_order dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
    1.51        sleep 5
    1.52      done
    1.53  
    1.54 @@ -245,13 +240,13 @@
    1.55  `lf_update_suggestion_order`, the following commands should be executed in
    1.56  background:
    1.57  
    1.58 -    su - www-data
    1.59 +    su www-data -s $SHELL
    1.60      cd /opt/liquid_feedback_frontend/
    1.61      echo "Event:send_notifications_loop()" | ../webmcp/bin/webmcp_shell myconfig
    1.62  
    1.63  
    1.64 -12. Start the sytem
    1.65 --------------------
    1.66 +12. Start the system
    1.67 +--------------------
    1.68  
    1.69  After `lf_update` has been executed at least once and (in case of WebMCP 1.2.x)
    1.70  the webserver has been restarted (using the configuration above), you should be
    1.71 @@ -259,12 +254,28 @@
    1.72  
    1.73  If you use WebMCP 2.x, the server is started by calling:
    1.74  
    1.75 +    su www-data -s $SHELL
    1.76      /opt/moonbridge/moonbridge /opt/webmcp/bin/mcp.lua /opt/webmcp/ /opt/liquid_feedback_frontend/ main myconfig
    1.77  
    1.78  In the latter case, the Moonbridge server will open a TCP port according to
    1.79  your configuration. Directly accessing this TCP port through your webbrowser
    1.80  is helpful for development purposes. For real-life deployment, however, it is
    1.81  recommended to further proxy the application (e.g. using nginx). The proxy can
    1.82 -also add HTTPS support (which is not supported by Moonbridge itself).
    1.83 +also add HTTPS and/or HTTP/2 support (which is not supported by Moonbridge
    1.84 +itself).
    1.85 +
    1.86 +To start the Moonbridge as a background process, please refer to the Moonbridge
    1.87 +command line options:
    1.88 +
    1.89 +    Get this help message: moonbridge {-h|--help}
    1.90 +    Usage: moonbridge \
    1.91 +               [-b|--background] \
    1.92 +               [-d|--debug] \
    1.93 +               [-f|--logfacility {DAEMON|USER|0|1|...|7}] \
    1.94 +               [-i|--logident <syslog ident> \
    1.95 +               [-l|--logfile <logfile>] \
    1.96 +               [-p|--pidfile <pidfile>] \
    1.97 +               [-s|--stats] \
    1.98 +               -- <Lua script> [<cmdline options for Lua script>]
    1.99  
   1.100