# HG changeset patch
# User jbe
# Date 1427149063 -3600
# Node ID 08adef9f05b9f97dbda7f0f01bf8cc50de3e80d0
# Parent  91089defc3eac6ac300b821e63c7a652124078b5
Updated installation instructions for WebMCP 2.x

diff -r 91089defc3ea -r 08adef9f05b9 INSTALL.html
--- a/INSTALL.html	Sun Mar 22 22:59:17 2015 +0100
+++ b/INSTALL.html	Mon Mar 23 23:17:43 2015 +0100
@@ -14,14 +14,12 @@
 installed:</p>
 
 <ul>
-<li>lua5.1</li>
+<li>build-essential</li>
+<li>lua5.2</li>
+<li>liblua5.2-dev</li>
 <li>postgresql</li>
-<li>build-essential</li>
 <li>libpq-dev</li>
-<li>liblua5.1-0-dev</li>
-<li>lighttpd</li>
-<li>ghc</li>
-<li>libghc6-parsec3-dev</li>
+<li>lighttpd (only for WebMCP 1.2.x support)</li>
 <li>imagemagick</li>
 <li>exim4</li>
 <li>markdown2 (install with Python's pip)</li>
@@ -32,10 +30,10 @@
 
 <h2>2. Ensure that the user account of your webserver has access to the database</h2>
 
-<p>Whichever useraccount is used by the webserver (usually <code>www-data</code>) needs to
-have access to your PostgreSQL installation. This is done by executing
-PostgreSQL's shell command <code>createuser</code> as database superuser (usually <code>pgsql</code>,
-or <code>postgres</code> for Debian installations):</p>
+<p>The useraccount of the webserver (usually <code>www-data</code>) or the Moonbridge server
+process needs to have access to your PostgreSQL installation. This is done by
+executing PostgreSQL's shell command <code>createuser</code> as database superuser
+(usually <code>pgsql</code>, or <code>postgres</code> for Debian installations):</p>
 
 <pre><code>su - postgres
 createuser
@@ -99,21 +97,31 @@
 <pre><code>exit
 </code></pre>
 
-<h2>4. Install WebMCP</h2>
+<h2>4. Install Moonbridge (only for WebMCP 2.x)</h2>
 
-<p>Note: Using Debian, it may be necessary to append <code>-I /usr/include/lua5.1</code> at
+<pre><code># Download and unpack Moonbridge
+# from http://www.public-software-group.org/pub/projects/moonbridge/
+pmake MOONBR_LUA_PATH=/opt/moonbridge/?.lua
+mkdir /opt/moonbridge
+cp moonbridge /opt/moonbridge/
+cp moonbridge_http.lua /opt/moonbridge/
+</code></pre>
+
+<h2>5. Install WebMCP</h2>
+
+<p>Note: Using Debian, it may be necessary to append <code>-I /usr/include/lua5.2</code> at
 the end of the CFLAGS line in <code>Makefile.options</code> of the WebMCP source
 distibution:</p>
 
 <pre><code># Download and unpack WebMCP
 # from http://www.public-software-group.org/pub/projects/webmcp/
-vi Makefile.options  # Debian requires  -I /usr/include/lua5.1  at end of CFLAGS line
+vi Makefile.options  # Debian requires  -I /usr/include/lua5.2  at end of CFLAGS line
 make
 mkdir /opt/webmcp
 cp -RL framework/* /opt/webmcp/
 </code></pre>
 
-<h2>5. Install the LiquidFeedback-Frontend</h2>
+<h2>6. Install the LiquidFeedback-Frontend</h2>
 
 <p>Unpack source tree into appropriate directory, e.g. <code>/opt/liquid_feedback_frontend</code>:</p>
 
@@ -122,30 +130,24 @@
 mv liquid_feedback_frontend-vX.X.X /opt/liquid_feedback_frontend
 </code></pre>
 
-<p>Create HTML code for help texts:</p>
-
-<pre><code>cd /opt/liquid_feedback_frontend/locale
-PATH=/opt/rocketwiki-lqfb:$PATH make
-</code></pre>
-
 <p>Make <code>tmp/</code> directory of LiquidFeedback-Frontend writable for webserver:</p>
 
 <pre><code>chown www-data /opt/liquid_feedback_frontend/tmp
 </code></pre>
 
-<p>Compile binary for fast delivery of member images:</p>
+<p>Compile binary for fast delivery of member images (only necessary for WebMCP 1.2.x):</p>
 
 <pre><code>cd /opt/liquid_feedback_frontend/fastpath
 vi getpic.c  # check and modify #define commands as necessary
 make
 </code></pre>
 
-<h2>6. Configure mail system</h2>
+<h2>7. Configure mail system</h2>
 
 <p>It may be necessary to configure your server's mail system, e.g. running
 <code>dpkg-reconfigure exim4-config</code> on a Debian system.</p>
 
-<h2>7. Configure the Webserver for LiquidFeedback:</h2>
+<h2>8. Configure the Webserver for LiquidFeedback (only for WebMCP 1.2.x)</h2>
 
 <p>A sample configuration for <code>lighttpd</code> is given below (assuming <code>mod_alias</code> has
 been included elsewhere):</p>
@@ -188,7 +190,7 @@
 <code>/etc/lighttpd/conf-available/60-liquidfeedback.conf</code> and create a softlink in
 <code>/etc/lighttpd/conf-enabled/</code>.</p>
 
-<h2>8. Configure the LiquidFeedback-Frontend:</h2>
+<h2>9. Configure the LiquidFeedback-Frontend</h2>
 
 <pre><code>cd /opt/liquid_feedback_frontend/config
 cp example.lua myconfig.lua
@@ -196,14 +198,14 @@
 </code></pre>
 
 <p>Use the following option in your configuration file to enable fast image
-loading:</p>
+loading (only for WebMCP 1.2.x):</p>
 
 <pre><code>config.fastpath_url_func = function(member_id, image_type)
   return request.get_absolute_baseurl() .. "fastpath/getpic?" .. tostring(member_id) .. "+" .. tostring(image_type)
 end
 </code></pre>
 
-<h2>9. Setup regular execution of <code>lf_update</code> and related commands </h2>
+<h2>10. Setup regular execution of <code>lf_update</code> and related commands </h2>
 
 <p>The executables <code>lf_update</code>, <code>lf_update_issue_order</code>, and
 <code>lf_update_suggestion_order</code> must be executed regularly. This may be achieved
@@ -237,7 +239,7 @@
 
 <p>And this file should be started automatically at system boot.</p>
 
-<h2>10. Setup notification loop in background</h2>
+<h2>11. Setup notification loop in background (only for WebMCP 1.2.x)</h2>
 
 <p>In addition to regular execution of <code>lf_update</code> and
 <code>lf_update_suggestion_order</code>, the following commands should be executed in
@@ -248,10 +250,15 @@
 echo "Event:send_notifications_loop()" | ../webmcp/bin/webmcp_shell myconfig
 </code></pre>
 
-<h2>11. Start the sytem</h2>
+<h2>12. Start the sytem</h2>
 
 <p>After <code>lf_update</code> has been executed at least once, and the webserver has been
 restarted (using the configuration above), you should be able to access your
 LiquidFeedback system.</p>
+
+<p>If you use WebMCP 2.x, the server is started by calling:</p>
+
+<pre><code>/opt/moonbridge/moonbridge /opt/webmcp/bin/mcp.lua /opt/webmcp/ /opt/liquid_feedback_frontend/ main myconfig
+</code></pre>
 </body>
 </html>
diff -r 91089defc3ea -r 08adef9f05b9 INSTALL.mkd
--- a/INSTALL.mkd	Sun Mar 22 22:59:17 2015 +0100
+++ b/INSTALL.mkd	Mon Mar 23 23:17:43 2015 +0100
@@ -11,14 +11,12 @@
 If you're using a Debian system, make sure that the following packages are
 installed:
 
-  * lua5.1
+  * build-essential
+  * lua5.2
+  * liblua5.2-dev
   * postgresql
-  * build-essential
   * libpq-dev
-  * liblua5.1-0-dev
-  * lighttpd
-  * ghc
-  * libghc6-parsec3-dev
+  * lighttpd (only for WebMCP 1.2.x support)
   * imagemagick
   * exim4
   * markdown2 (install with Python's pip)
@@ -30,10 +28,10 @@
 2. Ensure that the user account of your webserver has access to the database
 ----------------------------------------------------------------------------
 
-Whichever useraccount is used by the webserver (usually `www-data`) needs to
-have access to your PostgreSQL installation. This is done by executing
-PostgreSQL's shell command `createuser` as database superuser (usually `pgsql`,
-or `postgres` for Debian installations):
+The useraccount of the webserver (usually `www-data`) or the Moonbridge server
+process needs to have access to your PostgreSQL installation. This is done by
+executing PostgreSQL's shell command `createuser` as database superuser
+(usually `pgsql`, or `postgres` for Debian installations):
 
     su - postgres
     createuser
@@ -94,22 +92,33 @@
     exit
 
 
-4. Install WebMCP
+4. Install Moonbridge (only for WebMCP 2.x)
+-------------------------------------------
+
+    # Download and unpack Moonbridge
+    # from http://www.public-software-group.org/pub/projects/moonbridge/
+    pmake MOONBR_LUA_PATH=/opt/moonbridge/?.lua
+    mkdir /opt/moonbridge
+    cp moonbridge /opt/moonbridge/
+    cp moonbridge_http.lua /opt/moonbridge/
+
+
+5. Install WebMCP
 -----------------
 
-Note: Using Debian, it may be necessary to append `-I /usr/include/lua5.1` at
+Note: Using Debian, it may be necessary to append `-I /usr/include/lua5.2` at
 the end of the CFLAGS line in `Makefile.options` of the WebMCP source
 distibution:
 
     # Download and unpack WebMCP
     # from http://www.public-software-group.org/pub/projects/webmcp/
-    vi Makefile.options  # Debian requires  -I /usr/include/lua5.1  at end of CFLAGS line
+    vi Makefile.options  # Debian requires  -I /usr/include/lua5.2  at end of CFLAGS line
     make
     mkdir /opt/webmcp
     cp -RL framework/* /opt/webmcp/
 
 
-5. Install the LiquidFeedback-Frontend
+6. Install the LiquidFeedback-Frontend
 --------------------------------------
 
 Unpack source tree into appropriate directory, e.g. `/opt/liquid_feedback_frontend`:
@@ -118,31 +127,26 @@
     # from http://www.public-software-group.org/pub/projects/liquid_feedback/frontend/
     mv liquid_feedback_frontend-vX.X.X /opt/liquid_feedback_frontend
 
-Create HTML code for help texts:
-
-    cd /opt/liquid_feedback_frontend/locale
-    PATH=/opt/rocketwiki-lqfb:$PATH make
-
 Make `tmp/` directory of LiquidFeedback-Frontend writable for webserver:
 
     chown www-data /opt/liquid_feedback_frontend/tmp
 
-Compile binary for fast delivery of member images:
+Compile binary for fast delivery of member images (only necessary for WebMCP 1.2.x):
 
     cd /opt/liquid_feedback_frontend/fastpath
     vi getpic.c  # check and modify #define commands as necessary
     make
 
 
-6. Configure mail system
+7. Configure mail system
 ------------------------
 
 It may be necessary to configure your server's mail system, e.g. running
 `dpkg-reconfigure exim4-config` on a Debian system.
 
 
-7. Configure the Webserver for LiquidFeedback:
-----------------------------------------------
+8. Configure the Webserver for LiquidFeedback (only for WebMCP 1.2.x)
+---------------------------------------------------------------------
 
 A sample configuration for `lighttpd` is given below (assuming `mod_alias` has
 been included elsewhere):
@@ -185,23 +189,23 @@
 `/etc/lighttpd/conf-enabled/`.
 
 
-8. Configure the LiquidFeedback-Frontend:
------------------------------------------
+9. Configure the LiquidFeedback-Frontend
+----------------------------------------
 
     cd /opt/liquid_feedback_frontend/config
     cp example.lua myconfig.lua
     # edit myconfig.lua according to your needs
 
 Use the following option in your configuration file to enable fast image
-loading:
+loading (only for WebMCP 1.2.x):
 
     config.fastpath_url_func = function(member_id, image_type)
       return request.get_absolute_baseurl() .. "fastpath/getpic?" .. tostring(member_id) .. "+" .. tostring(image_type)
     end
 
 
-9. Setup regular execution of `lf_update` and related commands 
---------------------------------------------------------------
+10. Setup regular execution of `lf_update` and related commands 
+---------------------------------------------------------------
 
 The executables `lf_update`, `lf_update_issue_order`, and
 `lf_update_suggestion_order` must be executed regularly. This may be achieved
@@ -234,8 +238,8 @@
 And this file should be started automatically at system boot.
 
 
-10. Setup notification loop in background
------------------------------------------
+11. Setup notification loop in background (only for WebMCP 1.2.x)
+-----------------------------------------------------------------
 
 In addition to regular execution of `lf_update` and
 `lf_update_suggestion_order`, the following commands should be executed in
@@ -246,11 +250,14 @@
     echo "Event:send_notifications_loop()" | ../webmcp/bin/webmcp_shell myconfig
 
 
-11. Start the sytem
+12. Start the sytem
 -------------------
 
 After `lf_update` has been executed at least once, and the webserver has been
 restarted (using the configuration above), you should be able to access your
 LiquidFeedback system.
 
+If you use WebMCP 2.x, the server is started by calling:
 
+    /opt/moonbridge/moonbridge /opt/webmcp/bin/mcp.lua /opt/webmcp/ /opt/liquid_feedback_frontend/ main myconfig
+