From d99bd00597122bb9e336435d3528241862f9f6f7 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Fri, 13 Aug 2021 09:52:04 +0800
Subject: [PATCH] Sync package version numbers in upgrade tutorials.
---
en_US/integrations/0-integration.mlmmj.ldap.md | 10 +++++-----
en_US/integrations/0-integration.mlmmj.mysql.md | 10 +++++-----
en_US/integrations/0-integration.mlmmj.pgsql.md | 10 +++++-----
en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md | 4 ++--
html/integration.mlmmj.ldap.html | 10 +++++-----
html/integration.mlmmj.mysql.html | 10 +++++-----
html/integration.mlmmj.pgsql.html | 10 +++++-----
html/upgrade.iredmail.0.9.7-0.9.8.html | 4 ++--
8 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/en_US/integrations/0-integration.mlmmj.ldap.md b/en_US/integrations/0-integration.mlmmj.ldap.md
index d9e878e5..a18662b9 100644
--- a/en_US/integrations/0-integration.mlmmj.ldap.md
+++ b/en_US/integrations/0-integration.mlmmj.ldap.md
@@ -240,17 +240,17 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier.
!!! attention
- We use version `3.0.4` for example below.
+ We use version `3.1.2` for example below.
- `mlmmjadmin-3.x` and later releases requires Python 3.
- `mlmmjadmin-2.x` and older releases requires Python 2.
```
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/3.0.4.tar.gz
-tar zxf 3.0.4.tar.gz -C /opt
-rm -f 3.0.4.tar.gz
-ln -s /opt/mlmmjadmin-3.0.4 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/3.1.2.tar.gz
+tar zxf 3.1.2.tar.gz -C /opt
+rm -f 3.1.2.tar.gz
+ln -s /opt/mlmmjadmin-3.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 dde9c1aa..281dcf49 100644
--- a/en_US/integrations/0-integration.mlmmj.mysql.md
+++ b/en_US/integrations/0-integration.mlmmj.mysql.md
@@ -255,17 +255,17 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier.
!!! attention
- We use version `3.0.4` for example below.
+ We use version `3.1.2` for example below.
- `mlmmjadmin-3.x` and later releases requires Python 3.
- `mlmmjadmin-2.x` and older releases requires Python 2.
```
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/3.0.4.tar.gz
-tar zxf 3.0.4.tar.gz -C /opt
-rm -f 3.0.4.tar.gz
-ln -s /opt/mlmmjadmin-3.0.4 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/3.1.2.tar.gz
+tar zxf 3.1.2.tar.gz -C /opt
+rm -f 3.1.2.tar.gz
+ln -s /opt/mlmmjadmin-3.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 506e0079..7789bb43 100644
--- a/en_US/integrations/0-integration.mlmmj.pgsql.md
+++ b/en_US/integrations/0-integration.mlmmj.pgsql.md
@@ -256,17 +256,17 @@ We will setup `mlmmjadmin` program to make managing mailing lists easier.
!!! attention
- We use version `3.0.4` for example below.
+ We use version `3.1.2` for example below.
- `mlmmjadmin-3.x` and later releases requires Python 3.
- `mlmmjadmin-2.x` and older releases requires Python 2.
```
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/3.0.4.tar.gz
-tar zxf 3.0.4.tar.gz -C /opt
-rm -f 3.0.4.tar.gz
-ln -s /opt/mlmmjadmin-3.0.4 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/3.1.2.tar.gz
+tar zxf 3.1.2.tar.gz -C /opt
+rm -f 3.1.2.tar.gz
+ln -s /opt/mlmmjadmin-3.1.2 /opt/mlmmjadmin
```
* Generate config file by copying sample file, `settings.py.sample`:
diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md b/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md
index 2e197771..23f6cd79 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md
@@ -166,12 +166,12 @@ wget https://github.com/iredmail/iRedMail/raw/1.0/samples/fail2ban/filter.d/post
Debian/Ubuntu, it's `/var/log/mail.log`.
```
-[postfix-pregreet-iredmail]
+[postfix-pregreet]
enabled = true
filter = postfix-pregreet.iredmail
logpath = /var/log/maillog
maxretry = 1
-action = iptables-multiport[name=postfix, port="25", protocol=tcp]
+action = iptables-multiport[name=postfix-pregreet, port="25", protocol=tcp]
```
* Restarting Fail2ban service is required.
diff --git a/html/integration.mlmmj.ldap.html b/html/integration.mlmmj.ldap.html
index 08b508c6..8d99ebbb 100644
--- a/html/integration.mlmmj.ldap.html
+++ b/html/integration.mlmmj.ldap.html
@@ -257,7 +257,7 @@ fully integrated.
extract downloaded package to /opt/
directory, and create a symbol link:
Attention
-
We use version 3.0.4
for example below.
+
We use version 3.1.2
for example below.
mlmmjadmin-3.x
and later releases requires Python 3.
mlmmjadmin-2.x
and older releases requires Python 2.
@@ -266,10 +266,10 @@ fully integrated.
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/3.0.4.tar.gz
-tar zxf 3.0.4.tar.gz -C /opt
-rm -f 3.0.4.tar.gz
-ln -s /opt/mlmmjadmin-3.0.4 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/3.1.2.tar.gz
+tar zxf 3.1.2.tar.gz -C /opt
+rm -f 3.1.2.tar.gz
+ln -s /opt/mlmmjadmin-3.1.2 /opt/mlmmjadmin
diff --git a/html/integration.mlmmj.mysql.html b/html/integration.mlmmj.mysql.html
index 9eab2c27..e3d6a83e 100644
--- a/html/integration.mlmmj.mysql.html
+++ b/html/integration.mlmmj.mysql.html
@@ -272,7 +272,7 @@ fully integrated.
extract downloaded package to /opt/
directory, and create a symbol link:
Attention
-
We use version 3.0.4
for example below.
+
We use version 3.1.2
for example below.
mlmmjadmin-3.x
and later releases requires Python 3.
mlmmjadmin-2.x
and older releases requires Python 2.
@@ -281,10 +281,10 @@ fully integrated.
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/3.0.4.tar.gz
-tar zxf 3.0.4.tar.gz -C /opt
-rm -f 3.0.4.tar.gz
-ln -s /opt/mlmmjadmin-3.0.4 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/3.1.2.tar.gz
+tar zxf 3.1.2.tar.gz -C /opt
+rm -f 3.1.2.tar.gz
+ln -s /opt/mlmmjadmin-3.1.2 /opt/mlmmjadmin
diff --git a/html/integration.mlmmj.pgsql.html b/html/integration.mlmmj.pgsql.html
index b739d8c1..fbd447f1 100644
--- a/html/integration.mlmmj.pgsql.html
+++ b/html/integration.mlmmj.pgsql.html
@@ -273,7 +273,7 @@ fully integrated.
extract downloaded package to /opt/
directory, and create a symbol link:
Attention
-
We use version 3.0.4
for example below.
+
We use version 3.1.2
for example below.
mlmmjadmin-3.x
and later releases requires Python 3.
mlmmjadmin-2.x
and older releases requires Python 2.
@@ -282,10 +282,10 @@ fully integrated.
cd /root/
-wget https://github.com/iredmail/mlmmjadmin/archive/3.0.4.tar.gz
-tar zxf 3.0.4.tar.gz -C /opt
-rm -f 3.0.4.tar.gz
-ln -s /opt/mlmmjadmin-3.0.4 /opt/mlmmjadmin
+wget https://github.com/iredmail/mlmmjadmin/archive/3.1.2.tar.gz
+tar zxf 3.1.2.tar.gz -C /opt
+rm -f 3.1.2.tar.gz
+ln -s /opt/mlmmjadmin-3.1.2 /opt/mlmmjadmin
diff --git a/html/upgrade.iredmail.0.9.7-0.9.8.html b/html/upgrade.iredmail.0.9.7-0.9.8.html
index 2df208a1..4b944858 100644
--- a/html/upgrade.iredmail.0.9.7-0.9.8.html
+++ b/html/upgrade.iredmail.0.9.7-0.9.8.html
@@ -212,12 +212,12 @@ Debian/Ubuntu, it's /var/log/mail.log
.
-
[postfix-pregreet-iredmail]
+[postfix-pregreet]
enabled = true
filter = postfix-pregreet.iredmail
logpath = /var/log/maillog
maxretry = 1
-action = iptables-multiport[name=postfix, port="25", protocol=tcp]
+action = iptables-multiport[name=postfix-pregreet, port="25", protocol=tcp]