# HG changeset patch
# User jbe
# Date 1428844294 -7200
# Node ID 8259fb540324edc73476c5657f57b1a3ad77f45f
# Parent  9700ce0d55416050afb45e984ba458ebacd9d1ac
Improved installation instructions (mention python-pip package; deal with /usr/sbin/nologin on Ubuntu)

diff -r 9700ce0d5541 -r 8259fb540324 INSTALL.html
--- a/INSTALL.html	Sun Mar 29 20:31:32 2015 +0200
+++ b/INSTALL.html	Sun Apr 12 15:11:34 2015 +0200
@@ -23,7 +23,7 @@
 <li>pmake or bmake (only for WebMCP 2.x with Moonbridge)</li>
 <li>imagemagick</li>
 <li>exim4</li>
-<li>markdown2 (install with Python's pip)</li>
+<li>markdown2 (<code>apt-get install python-pip; pip install markdown2</code>)</li>
 </ul>
 
 <p>If you're using any other Linux distribution or BSD system, install the
@@ -36,14 +36,8 @@
 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
-
-Enter name of role to add: www-data
-Shall the new role be a superuser? (y/n) n
-Shall the new role be allowed to create databases? (y/n) y
-Shall the new role be allowed to create more new roles? (y/n) n
-
+<pre><code>su postgres -s $SHELL
+createuser --no-superuser --createdb --no-createrole www-data
 exit
 </code></pre>
 
@@ -61,7 +55,7 @@
 make
 mkdir /opt/liquid_feedback_core
 cp core.sql lf_update lf_update_issue_order /opt/liquid_feedback_core
-su - www-data
+su www-data -s $SHELL
 cd /opt/liquid_feedback_core
 createdb liquid_feedback
 createlang plpgsql liquid_feedback  # command may be omitted, depending on PostgreSQL version
@@ -226,9 +220,9 @@
 echo "${PID}" &gt; "${PIDFILE}"
 
 while true; do
-  su - www-data -c 'nice /opt/liquid_feedback_core/lf_update dbname=liquid_feedback 2&gt;&amp;1 | logger -t "lf_updated"'
-  su - www-data -c 'nice /opt/liquid_feedback_core/lf_update_issue_order dbname=liquid_feedback 2&gt;&amp;1 | logger -t "lf_updated"'
-  su - www-data -c 'nice /opt/liquid_feedback_core/lf_update_suggestion_order dbname=liquid_feedback 2&gt;&amp;1 | logger -t "lf_updated"'
+  su - www-data -s /bin/sh -c 'nice /opt/liquid_feedback_core/lf_update dbname=liquid_feedback 2&gt;&amp;1 | logger -t "lf_updated"'
+  su - www-data -s /bin/sh -c 'nice /opt/liquid_feedback_core/lf_update_issue_order dbname=liquid_feedback 2&gt;&amp;1 | logger -t "lf_updated"'
+  su - www-data -s /bin/sh -c 'nice /opt/liquid_feedback_core/lf_update_suggestion_order dbname=liquid_feedback 2&gt;&amp;1 | logger -t "lf_updated"'
   sleep 5
 done
 </code></pre>
@@ -246,7 +240,7 @@
 <code>lf_update_suggestion_order</code>, the following commands should be executed in
 background:</p>
 
-<pre><code>su - www-data
+<pre><code>su www-data -s $SHELL
 cd /opt/liquid_feedback_frontend/
 echo "Event:send_notifications_loop()" | ../webmcp/bin/webmcp_shell myconfig
 </code></pre>
diff -r 9700ce0d5541 -r 8259fb540324 INSTALL.mkd
--- a/INSTALL.mkd	Sun Mar 29 20:31:32 2015 +0200
+++ b/INSTALL.mkd	Sun Apr 12 15:11:34 2015 +0200
@@ -20,7 +20,7 @@
   * pmake or bmake (only for WebMCP 2.x with Moonbridge)
   * imagemagick
   * exim4
-  * markdown2 (install with Python's pip)
+  * markdown2 (``apt-get install python-pip; pip install markdown2``)
 
 If you're using any other Linux distribution or BSD system, install the
 necessary software components accordingly.
@@ -34,14 +34,8 @@
 executing PostgreSQL's shell command `createuser` as database superuser
 (usually `pgsql`, or `postgres` for Debian installations):
 
-    su - postgres
-    createuser
-
-    Enter name of role to add: www-data
-    Shall the new role be a superuser? (y/n) n
-    Shall the new role be allowed to create databases? (y/n) y
-    Shall the new role be allowed to create more new roles? (y/n) n
-
+    su postgres -s $SHELL
+    createuser --no-superuser --createdb --no-createrole www-data
     exit
 
 
@@ -60,7 +54,7 @@
     make
     mkdir /opt/liquid_feedback_core
     cp core.sql lf_update lf_update_issue_order /opt/liquid_feedback_core
-    su - www-data
+    su www-data -s $SHELL
     cd /opt/liquid_feedback_core
     createdb liquid_feedback
     createlang plpgsql liquid_feedback  # command may be omitted, depending on PostgreSQL version
@@ -226,9 +220,9 @@
     echo "${PID}" > "${PIDFILE}"
 
     while true; do
-      su - www-data -c 'nice /opt/liquid_feedback_core/lf_update dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
-      su - www-data -c 'nice /opt/liquid_feedback_core/lf_update_issue_order dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
-      su - www-data -c 'nice /opt/liquid_feedback_core/lf_update_suggestion_order dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
+      su - www-data -s /bin/sh -c 'nice /opt/liquid_feedback_core/lf_update dbname=liquid_feedback 2>&1 | logger -t "lf_updated"'
+      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"'
+      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"'
       sleep 5
     done
 
@@ -246,7 +240,7 @@
 `lf_update_suggestion_order`, the following commands should be executed in
 background:
 
-    su - www-data
+    su www-data -s $SHELL
     cd /opt/liquid_feedback_frontend/
     echo "Event:send_notifications_loop()" | ../webmcp/bin/webmcp_shell myconfig