1.1 --- a/INSTALL.mkd	Mon Dec 14 17:54:06 2015 +0100
     1.2 +++ b/INSTALL.mkd	Mon Dec 21 12:21:52 2015 +0100
     1.3 @@ -16,8 +16,7 @@
     1.4    * liblua5.2-dev
     1.5    * postgresql
     1.6    * libpq-dev
     1.7 -  * lighttpd (only for WebMCP 1.2.x support)
     1.8 -  * pmake or bmake (only for WebMCP 2.x with Moonbridge)
     1.9 +  * pmake or bmake
    1.10    * imagemagick
    1.11    * exim4
    1.12    * markdown2 (``apt-get install python-pip; pip install markdown2``)
    1.13 @@ -87,8 +86,8 @@
    1.14      exit
    1.15  
    1.16  
    1.17 -4. Install Moonbridge (only for WebMCP 2.x)
    1.18 --------------------------------------------
    1.19 +4. Install Moonbridge
    1.20 +---------------------
    1.21  
    1.22      # Download and unpack Moonbridge
    1.23      # from http://www.public-software-group.org/pub/projects/moonbridge/
    1.24 @@ -126,12 +125,6 @@
    1.25  
    1.26      chown www-data /opt/liquid_feedback_frontend/tmp
    1.27  
    1.28 -Compile binary for fast delivery of member images (only necessary for WebMCP 1.2.x):
    1.29 -
    1.30 -    cd /opt/liquid_feedback_frontend/fastpath
    1.31 -    vi getpic.c  # check and modify #define commands as necessary
    1.32 -    make
    1.33 -
    1.34  
    1.35  7. Configure mail system
    1.36  ------------------------
    1.37 @@ -140,67 +133,16 @@
    1.38  `dpkg-reconfigure exim4-config` on a Debian system.
    1.39  
    1.40  
    1.41 -8. Configure the Webserver for LiquidFeedback (only for WebMCP 1.2.x)
    1.42 ----------------------------------------------------------------------
    1.43 -
    1.44 -A sample configuration for `lighttpd` is given below (assuming `mod_alias` has
    1.45 -been included elsewhere):
    1.46 -
    1.47 -    server.modules += ("mod_cgi", "mod_rewrite", "mod_redirect", "mod_setenv")
    1.48 -
    1.49 -    # Enable CGI-Execution of *.lua files through lua binary
    1.50 -    cgi.assign += ( ".lua" => "/usr/bin/lua5.1" )
    1.51 -
    1.52 -    alias.url += ( "/lf/fastpath/" => "/opt/liquid_feedback_frontend/fastpath/",
    1.53 -                   "/lf/static"    => "/opt/liquid_feedback_frontend/static",
    1.54 -                   "/lf"           => "/opt/webmcp/cgi-bin" )
    1.55 -
    1.56 -    # Configure environment for demo application
    1.57 -    $HTTP["url"] =~ "^/lf" {
    1.58 -      setenv.add-environment += (
    1.59 -        "LANG" => "en_US.UTF-8",
    1.60 -        "WEBMCP_APP_BASEPATH" => "/opt/liquid_feedback_frontend/",
    1.61 -        "WEBMCP_CONFIG_NAME"  => "myconfig")
    1.62 -    }
    1.63 -
    1.64 -    # URL beautification
    1.65 -    url.rewrite-once += (
    1.66 -      # do not rewrite static URLs
    1.67 -          "^/lf/fastpath/(.*)$" => "/lf/fastpath/$1",
    1.68 -          "^/lf/static/(.*)$"   => "/lf/static/$1",
    1.69 -
    1.70 -      # dynamic URLs
    1.71 -          "^/lf/([^\?]*)(\?(.*))?$" => "/lf/webmcp-wrapper.lua?_webmcp_path=$1&$3",
    1.72 -
    1.73 -    )
    1.74 -
    1.75 -    $HTTP["url"] =~ "^/lf/fastpath/" {
    1.76 -      cgi.assign = ( "" => "" )
    1.77 -      setenv.add-response-header = ( "Cache-Control" => "private; max-age=86400" )
    1.78 -    }
    1.79 -
    1.80 -If you're using Debian, you may want to create a file with the name
    1.81 -`/etc/lighttpd/conf-available/60-liquidfeedback.conf` and create a softlink in
    1.82 -`/etc/lighttpd/conf-enabled/`.
    1.83 -
    1.84 -
    1.85 -9. Configure the LiquidFeedback-Frontend
    1.86 +8. Configure the LiquidFeedback-Frontend
    1.87  ----------------------------------------
    1.88  
    1.89      cd /opt/liquid_feedback_frontend/config
    1.90      cp example.lua myconfig.lua
    1.91      # edit myconfig.lua according to your needs
    1.92  
    1.93 -Use the following option in your configuration file to enable fast image
    1.94 -loading (only for WebMCP 1.2.x):
    1.95  
    1.96 -    config.fastpath_url_func = function(member_id, image_type)
    1.97 -      return request.get_absolute_baseurl() .. "fastpath/getpic?" .. tostring(member_id) .. "+" .. tostring(image_type)
    1.98 -    end
    1.99 -
   1.100 -
   1.101 -10. Setup regular execution of `lf_update` and related commands 
   1.102 ----------------------------------------------------------------
   1.103 +9. Setup regular execution of `lf_update` and related commands 
   1.104 +--------------------------------------------------------------
   1.105  
   1.106  The executables `lf_update`, `lf_update_issue_order`, and
   1.107  `lf_update_suggestion_order` must be executed regularly. This may be achieved
   1.108 @@ -233,26 +175,13 @@
   1.109  And this file should be started automatically at system boot.
   1.110  
   1.111  
   1.112 -11. Setup notification loop in background (only for WebMCP 1.2.x)
   1.113 ------------------------------------------------------------------
   1.114 -
   1.115 -In addition to regular execution of `lf_update` and
   1.116 -`lf_update_suggestion_order`, the following commands should be executed in
   1.117 -background:
   1.118 -
   1.119 -    su www-data -s $SHELL
   1.120 -    cd /opt/liquid_feedback_frontend/
   1.121 -    echo "Event:send_notifications_loop()" | ../webmcp/bin/webmcp_shell myconfig
   1.122 -
   1.123 -
   1.124 -12. Start the system
   1.125 +10. Start the system
   1.126  --------------------
   1.127  
   1.128 -After `lf_update` has been executed at least once and (in case of WebMCP 1.2.x)
   1.129 -the webserver has been restarted (using the configuration above), you should be
   1.130 -able to access your LiquidFeedback system.
   1.131 +After `lf_update` has been executed at least once, you should be able to use
   1.132 +your LiquidFeedback system.
   1.133  
   1.134 -If you use WebMCP 2.x, the server is started by calling:
   1.135 +The server is started by calling:
   1.136  
   1.137      su www-data -s $SHELL
   1.138      /opt/moonbridge/moonbridge /opt/webmcp/bin/mcp.lua /opt/webmcp/ /opt/liquid_feedback_frontend/ main myconfig