From 1cf360c4cc99902725816b34ac4d6b1be98b118e Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Wed, 11 Apr 2018 11:35:47 +0200
Subject: [PATCH] Install python-requests for mlmmj + mlmmjadmin integration.
 Fix incorrect apt repo file name.

---
 en_US/integrations/0-integration.mlmmj.ldap.md  | 8 +++++---
 en_US/integrations/0-integration.mlmmj.mysql.md | 8 +++++---
 en_US/integrations/0-integration.mlmmj.pgsql.md | 8 +++++---
 en_US/upgrade/0-upgrade.sogo.3.to.4.md          | 4 ++--
 html/integration.mlmmj.ldap.html                | 8 +++++---
 html/integration.mlmmj.mysql.html               | 8 +++++---
 html/integration.mlmmj.pgsql.html               | 8 +++++---
 html/upgrade.sogo.3.to.4.html                   | 4 ++--
 8 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/en_US/integrations/0-integration.mlmmj.ldap.md b/en_US/integrations/0-integration.mlmmj.ldap.md
index 04dc1095..c0d0892b 100644
--- a/en_US/integrations/0-integration.mlmmj.ldap.md
+++ b/en_US/integrations/0-integration.mlmmj.ldap.md
@@ -51,13 +51,13 @@ a good idea to backup it now before you adding any new mailing lists.
   iRedMail by default. So we can install it directly:
 
 ```
-yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog
+yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog python-requests
 ```
 
 * On Debian/Ubuntu:
 
 ```
-apt-get install mlmmj uwsgi uwsgi-plugin-python
+apt-get install mlmmj uwsgi uwsgi-plugin-python python-requests
 ```
 
 * On FreeBSD:
@@ -67,6 +67,8 @@ cd /usr/ports/mail/mlmmj
 make install clean
 cd /usr/ports/www/uwsgi
 make install clean
+cd /usr/ports/www/py-requests
+make install clean
 ```
 
 * On OpenBSD (iRedMail always installs `uwsgi` during installation, so no need
@@ -230,7 +232,7 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier.
 cd /root/
 wget https://github.com/iredmail/mlmmjadmin/archive/1.2.tar.gz
 tar zxf 1.2.tar.gz -C /opt
-ln -s /opt/mlmmjadmin-1.1 /opt/mlmmjadmin
+ln -s /opt/mlmmjadmin-1.2 /opt/mlmmjadmin
 ```
 
 * Generate config file by copying sample file, `settings.py.sample`:
diff --git a/en_US/integrations/0-integration.mlmmj.mysql.md b/en_US/integrations/0-integration.mlmmj.mysql.md
index 28169fcc..3156a8f9 100644
--- a/en_US/integrations/0-integration.mlmmj.mysql.md
+++ b/en_US/integrations/0-integration.mlmmj.mysql.md
@@ -51,13 +51,13 @@ databases.
   iRedMail by default. So we can install it directly:
 
 ```
-yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog
+yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog python-requests
 ```
 
 * On Debian/Ubuntu:
 
 ```
-apt-get install mlmmj uwsgi uwsgi-plugin-python
+apt-get install mlmmj uwsgi uwsgi-plugin-python python-requests
 ```
 
 * On FreeBSD:
@@ -67,6 +67,8 @@ cd /usr/ports/mail/mlmmj
 make install clean
 cd /usr/ports/www/uwsgi
 make install clean
+cd /usr/ports/www/py-requests
+make install clean
 ```
 
 * On OpenBSD:
@@ -256,7 +258,7 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier.
 cd /root/
 wget https://github.com/iredmail/mlmmjadmin/archive/1.2.tar.gz
 tar zxf 1.2.tar.gz -C /opt
-ln -s /opt/mlmmjadmin-1.1 /opt/mlmmjadmin
+ln -s /opt/mlmmjadmin-1.2 /opt/mlmmjadmin
 ```
 
 * Generate config file by copying sample file, `settings.py.sample`:
diff --git a/en_US/integrations/0-integration.mlmmj.pgsql.md b/en_US/integrations/0-integration.mlmmj.pgsql.md
index 4b54966a..de80bb23 100644
--- a/en_US/integrations/0-integration.mlmmj.pgsql.md
+++ b/en_US/integrations/0-integration.mlmmj.pgsql.md
@@ -51,13 +51,13 @@ databases.
   iRedMail by default. So we can install it directly:
 
 ```
-yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog
+yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog python-requests
 ```
 
 * On Debian/Ubuntu:
 
 ```
-apt-get install mlmmj uwsgi uwsgi-plugin-python
+apt-get install mlmmj uwsgi uwsgi-plugin-python python-requests
 ```
 
 * On FreeBSD:
@@ -67,6 +67,8 @@ cd /usr/ports/mail/mlmmj
 make install clean
 cd /usr/ports/www/uwsgi
 make install clean
+cd /usr/ports/www/py-requests
+make install clean
 ```
 
 * On OpenBSD (iRedMail always installs `uwsgi` during installation, so no need
@@ -257,7 +259,7 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier.
 cd /root/
 wget https://github.com/iredmail/mlmmjadmin/archive/1.2.tar.gz
 tar zxf 1.2.tar.gz -C /opt
-ln -s /opt/mlmmjadmin-1.1 /opt/mlmmjadmin
+ln -s /opt/mlmmjadmin-1.2 /opt/mlmmjadmin
 ```
 
 * Generate config file by copying sample file, `settings.py.sample`:
diff --git a/en_US/upgrade/0-upgrade.sogo.3.to.4.md b/en_US/upgrade/0-upgrade.sogo.3.to.4.md
index a3e603a3..1fcc8120 100644
--- a/en_US/upgrade/0-upgrade.sogo.3.to.4.md
+++ b/en_US/upgrade/0-upgrade.sogo.3.to.4.md
@@ -77,8 +77,8 @@ cp /etc/default/sogo /root/sogo-backup/default/
 bash /var/vmail/backup/backup_sogo.sh
 ```
 
-* Open file `/etc/apt/sources.list`, change the version number `3` to `4`, like
-  below:
+* Open file `/etc/apt/sources.list` or `/etc/apt/sources.list.d/sogo-nightly.list`,
+  change the version number `3` to `4`, like below:
 
 ```
 # Debian
diff --git a/html/integration.mlmmj.ldap.html b/html/integration.mlmmj.ldap.html
index 141dafcd..03a97f6c 100644
--- a/html/integration.mlmmj.ldap.html
+++ b/html/integration.mlmmj.ldap.html
@@ -76,13 +76,13 @@ a good idea to backup it now before you adding any new mailing lists.</p>
 <li>On RHEL/CentOS, <code>mlmmj</code> is available in <code>EPEL</code> repo, and it's enabled in
   iRedMail by default. So we can install it directly:</li>
 </ul>
-<pre><code>yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog
+<pre><code>yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog python-requests
 </code></pre>
 
 <ul>
 <li>On Debian/Ubuntu:</li>
 </ul>
-<pre><code>apt-get install mlmmj uwsgi uwsgi-plugin-python
+<pre><code>apt-get install mlmmj uwsgi uwsgi-plugin-python python-requests
 </code></pre>
 
 <ul>
@@ -92,6 +92,8 @@ a good idea to backup it now before you adding any new mailing lists.</p>
 make install clean
 cd /usr/ports/www/uwsgi
 make install clean
+cd /usr/ports/www/py-requests
+make install clean
 </code></pre>
 
 <ul>
@@ -246,7 +248,7 @@ fully integrated.</p>
 <pre><code>cd /root/
 wget https://github.com/iredmail/mlmmjadmin/archive/1.2.tar.gz
 tar zxf 1.2.tar.gz -C /opt
-ln -s /opt/mlmmjadmin-1.1 /opt/mlmmjadmin
+ln -s /opt/mlmmjadmin-1.2 /opt/mlmmjadmin
 </code></pre>
 
 <ul>
diff --git a/html/integration.mlmmj.mysql.html b/html/integration.mlmmj.mysql.html
index b0732f34..6cf6c4ba 100644
--- a/html/integration.mlmmj.mysql.html
+++ b/html/integration.mlmmj.mysql.html
@@ -75,13 +75,13 @@ databases.</p>
 <li>On RHEL/CentOS, <code>mlmmj</code> is available in <code>EPEL</code> repo, and it's enabled in
   iRedMail by default. So we can install it directly:</li>
 </ul>
-<pre><code>yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog
+<pre><code>yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog python-requests
 </code></pre>
 
 <ul>
 <li>On Debian/Ubuntu:</li>
 </ul>
-<pre><code>apt-get install mlmmj uwsgi uwsgi-plugin-python
+<pre><code>apt-get install mlmmj uwsgi uwsgi-plugin-python python-requests
 </code></pre>
 
 <ul>
@@ -91,6 +91,8 @@ databases.</p>
 make install clean
 cd /usr/ports/www/uwsgi
 make install clean
+cd /usr/ports/www/py-requests
+make install clean
 </code></pre>
 
 <ul>
@@ -272,7 +274,7 @@ fully integrated.</p>
 <pre><code>cd /root/
 wget https://github.com/iredmail/mlmmjadmin/archive/1.2.tar.gz
 tar zxf 1.2.tar.gz -C /opt
-ln -s /opt/mlmmjadmin-1.1 /opt/mlmmjadmin
+ln -s /opt/mlmmjadmin-1.2 /opt/mlmmjadmin
 </code></pre>
 
 <ul>
diff --git a/html/integration.mlmmj.pgsql.html b/html/integration.mlmmj.pgsql.html
index 475b306a..9150f867 100644
--- a/html/integration.mlmmj.pgsql.html
+++ b/html/integration.mlmmj.pgsql.html
@@ -75,13 +75,13 @@ databases.</p>
 <li>On RHEL/CentOS, <code>mlmmj</code> is available in <code>EPEL</code> repo, and it's enabled in
   iRedMail by default. So we can install it directly:</li>
 </ul>
-<pre><code>yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog
+<pre><code>yum install mlmmj uwsgi uwsgi-plugin-python uwsgi-logger-syslog python-requests
 </code></pre>
 
 <ul>
 <li>On Debian/Ubuntu:</li>
 </ul>
-<pre><code>apt-get install mlmmj uwsgi uwsgi-plugin-python
+<pre><code>apt-get install mlmmj uwsgi uwsgi-plugin-python python-requests
 </code></pre>
 
 <ul>
@@ -91,6 +91,8 @@ databases.</p>
 make install clean
 cd /usr/ports/www/uwsgi
 make install clean
+cd /usr/ports/www/py-requests
+make install clean
 </code></pre>
 
 <ul>
@@ -273,7 +275,7 @@ fully integrated.</p>
 <pre><code>cd /root/
 wget https://github.com/iredmail/mlmmjadmin/archive/1.2.tar.gz
 tar zxf 1.2.tar.gz -C /opt
-ln -s /opt/mlmmjadmin-1.1 /opt/mlmmjadmin
+ln -s /opt/mlmmjadmin-1.2 /opt/mlmmjadmin
 </code></pre>
 
 <ul>
diff --git a/html/upgrade.sogo.3.to.4.html b/html/upgrade.sogo.3.to.4.html
index cf362398..012ee080 100644
--- a/html/upgrade.sogo.3.to.4.html
+++ b/html/upgrade.sogo.3.to.4.html
@@ -103,8 +103,8 @@ cp /etc/default/sogo /root/sogo-backup/default/
 </code></pre>
 
 <ul>
-<li>Open file <code>/etc/apt/sources.list</code>, change the version number <code>3</code> to <code>4</code>, like
-  below:</li>
+<li>Open file <code>/etc/apt/sources.list</code> or <code>/etc/apt/sources.list.d/sogo-nightly.list</code>,
+  change the version number <code>3</code> to <code>4</code>, like below:</li>
 </ul>
 <pre><code># Debian
 https://packages.inverse.ca/SOGo/nightly/4/debian ...