incubator-ponymail-site git commit: Automatic Site Publish by Buildbot

[gi...@apache.org]

Repository: incubator-ponymail-site
Updated Branches:
  refs/heads/asf-site c50d66d7c -> bf59c9d56


Automatic Site Publish by Buildbot


Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/commit/bf59c9d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/bf59c9d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/bf59c9d5

Branch: refs/heads/asf-site
Commit: bf59c9d56403e6e557ae8ac128eff568aa6814f5
Parents: c50d66d
Author: buildbot <in...@apache.org>
Authored: Sat Nov 12 03:59:55 2016 +0000
Committer: buildbot <in...@apache.org>
Committed: Sat Nov 12 03:59:55 2016 +0000

----------------------------------------------------------------------
 content/docs/install.ubuntu.html | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/bf59c9d5/content/docs/install.ubuntu.html
----------------------------------------------------------------------
diff --git a/content/docs/install.ubuntu.html b/content/docs/install.ubuntu.html
index b5f2103..aa4dd58 100644
--- a/content/docs/install.ubuntu.html
+++ b/content/docs/install.ubuntu.html
@@ -58,23 +58,21 @@ sudo pip3 install elasticsearch formatflowed netaddr chardet
 </pre></p>
 <p>Install ElasticSearch:</p>
 <pre>
-sudo apt-get default-jre-headless
 wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
 echo "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-2.x.list
-sudo apt-get update && sudo apt-get install elasticsearch
+sudo apt-get update && sudo apt-get install elasticsearch default-jre-headless
 </pre>
 
 <p>Compile and install mod_lua if necessary (httpd &lt; 2.4.17 on Ubuntu):
 <pre>
-apt-get install apache2-dev
-svn co https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/modules/lua/ /tmp/lua
-cd /tmp/lua/
-apxs -I/usr/include/lua5.2 -cia mod_lua.c lua_*.c -lm -llua5.2
+sudo apt-get install apache2-dev
+svn co https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x/modules/lua/
+cd lua/
+sudo apxs -I/usr/include/lua5.2 -cia mod_lua.c lua_*.c -lm -llua5.2
 </pre></p>
 <p>Check out a copy of Pony Mail:
 <pre>
-cd /var/www
-git clone https://github.com/apache/incubator-ponymail.git ponymail
+sudo git clone https://github.com/apache/incubator-ponymail.git /var/www/ponymail
 </pre></p>
 <p>Configure Elasticsearch to automatically start during bootup. For Ubuntu &lt;= 14.10:</p>
 <pre>
@@ -89,7 +87,7 @@ sudo /bin/systemctl enable elasticsearch.service
 
 <p>Start up ElasticSearch:</p>
 <pre>
-service elasticsearch start
+sudo service elasticsearch start
 </pre>
 
 <p>Set up Pony Mail:
@@ -98,19 +96,16 @@ cd /var/www/ponymail/tools
 sudo python3 setup.py
 [... answer questions asked by the setup script ...]
 </pre></p>
-<p>Set up Apache httpd by adding, for example, the following virtual host configuration:</p>
-<pre>
-<VirtualHost *:80>
+<p>Set up Apache httpd by adding, for example, the following virtual host configuration (e.g. in <code>/etc/apache2/sites-enabled/000-default.conf</code>):</p>
+<p><code>&lt;VirtualHost *:80&gt;
     ServerName mylists.foo.tld
     DocumentRoot /var/www/ponymail/site
     AddHandler      lua-script .lua
     LuaScope        thread
     LuaCodeCache    stat
     AcceptPathInfo  On
-</VirtualHost>
-</pre>
-
-<p>Enable mod_lua and start apache:</p>
+&lt;/VirtualHost&gt;</code></p>
+<p>Enable mod_lua and start apache, if not already enabled:</p>
 <pre>
 sudo a2enmod lua
 sudo service apache start