From e41e00b9c57cccbb932aa98bf878130194faa8f1 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <zhb@iredmail.org>
Date: Sat, 17 Jul 2021 18:14:44 +0800
Subject: [PATCH] Update upgrade.ubuntu.18.04-20.04.html. Fix incorrect python
 script.

---
 en_US/howto/upgrade.dovecot.2.2-2.3.md    | 6 +++---
 en_US/howto/upgrade.ubuntu.18.04-20.04.md | 8 ++++++++
 html/upgrade.dovecot.2.2-2.3.html         | 6 +++---
 html/upgrade.ubuntu.18.04-20.04.html      | 8 ++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/en_US/howto/upgrade.dovecot.2.2-2.3.md b/en_US/howto/upgrade.dovecot.2.2-2.3.md
index 156f9814..d38225d2 100644
--- a/en_US/howto/upgrade.dovecot.2.2-2.3.md
+++ b/en_US/howto/upgrade.dovecot.2.2-2.3.md
@@ -147,7 +147,7 @@ We need to add new ldap attribute/value pairs for existing mail users.
 
 ```
 cd /root/
-wget https://github.com/iredmail/iRedMail/raw/1.0/update/ldap/update-ldap-dovecot-2.3.py
+https://raw.githubusercontent.com/iredmail/iRedMail/master/update/ldap/update-ldap-dovecot-2.3.py
 ```
 
 * Open downloaded file `update-ldap-dovecot-2.3.py`, set LDAP server
@@ -167,9 +167,9 @@ You can find required LDAP credential in iRedAdmin config file or
 `cn=Manager,dc=xx,dc=xx` or `cn=vmailadmin,dc=xx,dc=xx` as bind dn is ok, both
 of them have read-write privilege to update mail accounts.
 
-* Execute this script, it will add required data:
+* Execute this script with Python-3, it will add required data:
 
 ```
-# python update-ldap-dovecot-2.3.py
+python3 update-ldap-dovecot-2.3.py
 ```
 
diff --git a/en_US/howto/upgrade.ubuntu.18.04-20.04.md b/en_US/howto/upgrade.ubuntu.18.04-20.04.md
index f8146922..ce971e34 100644
--- a/en_US/howto/upgrade.ubuntu.18.04-20.04.md
+++ b/en_US/howto/upgrade.ubuntu.18.04-20.04.md
@@ -66,3 +66,11 @@ access.log = /var/log/php-fpm/access.log
 slowlog = /var/log/php-fpm/slow.log
 request_slowlog_timeout = 10s
 ```
+
+* `/etc/nginx/conf-available/php-fpm.conf`:
+
+```
+upstream php_workers {
+    server 127.0.0.1:9999;
+}
+```
diff --git a/html/upgrade.dovecot.2.2-2.3.html b/html/upgrade.dovecot.2.2-2.3.html
index e2e2b75f..bbe90ee6 100644
--- a/html/upgrade.dovecot.2.2-2.3.html
+++ b/html/upgrade.dovecot.2.2-2.3.html
@@ -166,7 +166,7 @@ CREATE INDEX idx_mailbox_enablesievetls ON mailbox (enablesievetls);
 <li>Download script used to update existing mail users:</li>
 </ul>
 <pre><code>cd /root/
-wget https://github.com/iredmail/iRedMail/raw/1.0/update/ldap/update-ldap-dovecot-2.3.py
+https://raw.githubusercontent.com/iredmail/iRedMail/master/update/ldap/update-ldap-dovecot-2.3.py
 </code></pre>
 
 <ul>
@@ -186,9 +186,9 @@ bind_pw = 'password'
 <code>cn=Manager,dc=xx,dc=xx</code> or <code>cn=vmailadmin,dc=xx,dc=xx</code> as bind dn is ok, both
 of them have read-write privilege to update mail accounts.</p>
 <ul>
-<li>Execute this script, it will add required data:</li>
+<li>Execute this script with Python-3, it will add required data:</li>
 </ul>
-<pre><code># python update-ldap-dovecot-2.3.py
+<pre><code>python3 update-ldap-dovecot-2.3.py
 </code></pre><div class="footer">
     <p style="text-align: center; color: grey;">All documents are available in <a href="https://github.com/iredmail/docs/">GitHub repository</a>, and published under <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">Creative Commons</a> license. You can <a href="https://github.com/iredmail/docs/archive/master.zip">download the latest version</a> for offline reading. If you found something wrong, please do <a href="https://www.iredmail.org/contact.html">contact us</a> to fix it.</p>
 </div></body></html>
\ No newline at end of file
diff --git a/html/upgrade.ubuntu.18.04-20.04.html b/html/upgrade.ubuntu.18.04-20.04.html
index 9a07986a..0b8f1282 100644
--- a/html/upgrade.ubuntu.18.04-20.04.html
+++ b/html/upgrade.ubuntu.18.04-20.04.html
@@ -84,6 +84,14 @@ request_terminate_timeout = 60s
 access.log = /var/log/php-fpm/access.log
 slowlog = /var/log/php-fpm/slow.log
 request_slowlog_timeout = 10s
+</code></pre>
+
+<ul>
+<li><code>/etc/nginx/conf-available/php-fpm.conf</code>:</li>
+</ul>
+<pre><code>upstream php_workers {
+    server 127.0.0.1:9999;
+}
 </code></pre><div class="footer">
     <p style="text-align: center; color: grey;">All documents are available in <a href="https://github.com/iredmail/docs/">GitHub repository</a>, and published under <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">Creative Commons</a> license. You can <a href="https://github.com/iredmail/docs/archive/master.zip">download the latest version</a> for offline reading. If you found something wrong, please do <a href="https://www.iredmail.org/contact.html">contact us</a> to fix it.</p>
 </div></body></html>
\ No newline at end of file