ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject incubator-ponymail-site git commit: #240 cleaning up doc page for readability.
Date Sat, 12 Nov 2016 04:16:03 GMT
Repository: incubator-ponymail-site
Updated Branches:
  refs/heads/asf-site bf59c9d56 -> 68f16c2e4


#240 cleaning up doc page for readability.


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

Branch: refs/heads/asf-site
Commit: 68f16c2e4b707dad109282767b266efb44d8e182
Parents: bf59c9d
Author: John D. Ament <johndament@apache.org>
Authored: Fri Nov 11 23:15:55 2016 -0500
Committer: John D. Ament <johndament@apache.org>
Committed: Fri Nov 11 23:15:55 2016 -0500

----------------------------------------------------------------------
 content/docs/install.ubuntu.html       | 27 +++++++++++++--------------
 source/markdown/docs/INSTALL.ubuntu.md | 16 ++++++----------
 2 files changed, 19 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/68f16c2e/content/docs/install.ubuntu.html
----------------------------------------------------------------------
diff --git a/content/docs/install.ubuntu.html b/content/docs/install.ubuntu.html
index aa4dd58..68c96a4 100644
--- a/content/docs/install.ubuntu.html
+++ b/content/docs/install.ubuntu.html
@@ -54,15 +54,14 @@ sudo apt-get install apache2 git liblua5.2-dev lua-cjson lua-sec lua-socket
pyth
 
 <p>Install the required Python 3 modules:
 <pre>
-sudo pip3 install elasticsearch formatflowed netaddr chardet
+sudo pip3 install elasticsearch formatflowed netaddr
 </pre></p>
-<p>Install ElasticSearch:</p>
+<p>Install ElasticSearch:
 <pre>
 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 default-jre-headless
-</pre>
-
+sudo apt-get update &amp;&amp; sudo apt-get install elasticsearch default-jre-headless
+</pre></p>
 <p>Compile and install mod_lua if necessary (httpd &lt; 2.4.17 on Ubuntu):
 <pre>
 sudo apt-get install apache2-dev
@@ -74,17 +73,15 @@ sudo apxs -I/usr/include/lua5.2 -cia mod_lua.c lua_*.c -lm -llua5.2
 <pre>
 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>
+<p>Configure Elasticsearch to automatically start during bootup. For Ubuntu &lt;=
14.10:
 <pre>
 sudo update-rc.d elasticsearch defaults 95 10
-</pre>
-
-<p>For Ubuntu &gt;= 15.04:</p>
+</pre></p>
+<p>For Ubuntu &gt;= 15.04:
 <pre>
 sudo /bin/systemctl daemon-reload
 sudo /bin/systemctl enable elasticsearch.service
-</pre>
-
+</pre></p>
 <p>Start up ElasticSearch:</p>
 <pre>
 sudo service elasticsearch start
@@ -96,15 +93,17 @@ 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
(e.g. in <code>/etc/apache2/sites-enabled/000-default.conf</code>):</p>
-<p><code>&lt;VirtualHost *:80&gt;
+<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>):
+<pre>
+&lt;VirtualHost *:80&gt;
     ServerName mylists.foo.tld
     DocumentRoot /var/www/ponymail/site
     AddHandler      lua-script .lua
     LuaScope        thread
     LuaCodeCache    stat
     AcceptPathInfo  On
-&lt;/VirtualHost&gt;</code></p>
+&lt;/VirtualHost&gt;
+</pre></p>
 <p>Enable mod_lua and start apache, if not already enabled:</p>
 <pre>
 sudo a2enmod lua

http://git-wip-us.apache.org/repos/asf/incubator-ponymail-site/blob/68f16c2e/source/markdown/docs/INSTALL.ubuntu.md
----------------------------------------------------------------------
diff --git a/source/markdown/docs/INSTALL.ubuntu.md b/source/markdown/docs/INSTALL.ubuntu.md
index b3153af..dff4752 100644
--- a/source/markdown/docs/INSTALL.ubuntu.md
+++ b/source/markdown/docs/INSTALL.ubuntu.md
@@ -17,11 +17,10 @@ sudo apt-get install apache2 git liblua5.2-dev lua-cjson lua-sec lua-socket
pyth
 
 Install the required Python 3 modules:
 ~~~
-sudo pip3 install elasticsearch formatflowed netaddr chardet
+sudo pip3 install elasticsearch formatflowed netaddr
 ~~~
 
 Install ElasticSearch:
-
 ~~~
 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
@@ -36,20 +35,17 @@ 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:
 ~~~
 sudo git clone https://github.com/apache/incubator-ponymail.git /var/www/ponymail
 ~~~
 
 Configure Elasticsearch to automatically start during bootup. For Ubuntu <= 14.10:
-
 ~~~
 sudo update-rc.d elasticsearch defaults 95 10
 ~~~
 
 For Ubuntu >= 15.04:
-
 ~~~
 sudo /bin/systemctl daemon-reload
 sudo /bin/systemctl enable elasticsearch.service
@@ -70,17 +66,16 @@ sudo python3 setup.py
 
 
 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>
+~~~
+&lt;VirtualHost *:80&gt;
     ServerName mylists.foo.tld
     DocumentRoot /var/www/ponymail/site
     AddHandler      lua-script .lua
     LuaScope        thread
     LuaCodeCache    stat
     AcceptPathInfo  On
-</VirtualHost>
-```
+&lt;/VirtualHost&gt;
+~~~
 
 Enable mod_lua and start apache, if not already enabled:
 
@@ -97,3 +92,4 @@ elasticsearch settings once Pony mail is up and running.
 Refer to the [General installation documentation](INSTALLING.md) for
 detailed information about archiving messages, OAuth, mail settings and
 much more.
+


Mime
View raw message