You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by jo...@apache.org on 2016/11/12 03:59:51 UTC

incubator-ponymail-site git commit: Updating site docs with new page.

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


Updating site docs with new page.


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/c50d66d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/tree/c50d66d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/diff/c50d66d7

Branch: refs/heads/asf-site
Commit: c50d66d7c32a80c317548c584c59a4de7d1ed082
Parents: bd0d83e
Author: John D. Ament <jo...@apache.org>
Authored: Fri Nov 11 22:59:43 2016 -0500
Committer: John D. Ament <jo...@apache.org>
Committed: Fri Nov 11 22:59:43 2016 -0500

----------------------------------------------------------------------
 source/markdown/docs/INSTALL.ubuntu.md | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/c50d66d7/source/markdown/docs/INSTALL.ubuntu.md
----------------------------------------------------------------------
diff --git a/source/markdown/docs/INSTALL.ubuntu.md b/source/markdown/docs/INSTALL.ubuntu.md
index f840395..b3153af 100644
--- a/source/markdown/docs/INSTALL.ubuntu.md
+++ b/source/markdown/docs/INSTALL.ubuntu.md
@@ -23,25 +23,23 @@ sudo pip3 install elasticsearch formatflowed netaddr chardet
 Install ElasticSearch:
 
 ~~~
-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
 ~~~
 
 Compile and install mod_lua if necessary (httpd < 2.4.17 on Ubuntu):
 ~~~
-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
 ~~~
 
 
 Check out a copy of Pony Mail:
 ~~~
-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
 ~~~
 
 Configure Elasticsearch to automatically start during bootup. For Ubuntu <= 14.10:
@@ -60,7 +58,7 @@ sudo /bin/systemctl enable elasticsearch.service
 Start up ElasticSearch:
 
 ~~~
-service elasticsearch start
+sudo service elasticsearch start
 ~~~
 
 Set up Pony Mail:
@@ -71,9 +69,9 @@ sudo python3 setup.py
 ~~~
 
 
-Set up Apache httpd by adding, for example, the following virtual host configuration:
+Set up Apache httpd by adding, for example, the following virtual host configuration (e.g. in `/etc/apache2/sites-enabled/000-default.conf`):
 
-~~~
+```
 <VirtualHost *:80>
     ServerName mylists.foo.tld
     DocumentRoot /var/www/ponymail/site
@@ -82,9 +80,9 @@ Set up Apache httpd by adding, for example, the following virtual host configura
     LuaCodeCache    stat
     AcceptPathInfo  On
 </VirtualHost>
-~~~
+```
 
-Enable mod_lua and start apache:
+Enable mod_lua and start apache, if not already enabled:
 
 ~~~
 sudo a2enmod lua