From c26c5e36574194ec17f5a3ad8c5d2b923f8fb375 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Wed, 18 Apr 2018 17:50:33 +0800
Subject: [PATCH] Fix typo.
---
en_US/integrations/0-integration.mlmmj.pgsql.md | 4 ++--
en_US/upgrade/0-upgrade.iredmail.0.9.7-0.9.8.md | 6 +++---
html/integration.mlmmj.pgsql.html | 4 ++--
html/upgrade.iredmail.0.9.7-0.9.8.html | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/en_US/integrations/0-integration.mlmmj.pgsql.md b/en_US/integrations/0-integration.mlmmj.pgsql.md
index c06faf9d..d61b0989 100644
--- a/en_US/integrations/0-integration.mlmmj.pgsql.md
+++ b/en_US/integrations/0-integration.mlmmj.pgsql.md
@@ -165,7 +165,7 @@ transport_maps =
user = vmail
password = qsescZvV03f6YUtTMN2bQTejmjatzz
hosts = 127.0.0.1
-port = 3306
+port = 5432
dbname = vmail
query = SELECT maillists.transport FROM maillists,domain WHERE maillists.address='%s' AND maillists.active=1 AND maillists.domain = domain.domain AND domain.active=1
```
@@ -323,7 +323,7 @@ backend_cli = 'bk_iredmail_sql'
```
iredmail_sql_db_type = 'pgsql'
iredmail_sql_db_server = '127.0.0.1'
-iredmail_sql_db_port = 3306
+iredmail_sql_db_port = 5432
iredmail_sql_db_name = 'vmail'
iredmail_sql_db_user = 'vmailadmin'
iredmail_sql_db_password = ''
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 613cca77..7021b9bb 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
@@ -729,7 +729,7 @@ We've made some changes to `vmail` database:
Download SQL template file used to update SQL database:
```
-cd /root/
+cd /tmp/
wget https://bitbucket.org/zhb/iredmail/raw/default/extra/update/0.9.8/iredmail.pgsql
```
@@ -740,7 +740,7 @@ Connect to PostgreSQL server as `postgres` user and import the SQL file:
```
su - postgres
-psql -d vmail < /root/iredmail.mysql
+psql -d vmail < /tmp/iredmail.pgsql
```
### mlmmj (mailing list manager) integration
@@ -748,7 +748,7 @@ psql -d vmail < /root/iredmail.mysql
iRedMail-0.9.8 integrates mlmmj as mailing list manager, please follow our
document below to integrate it:
-* [Integrate mlmmj mailing list manager](./integration.mlmmj.mysql.html)
+* [Integrate mlmmj mailing list manager](./integration.mlmmj.pgsql.html)
!!! attention
diff --git a/html/integration.mlmmj.pgsql.html b/html/integration.mlmmj.pgsql.html
index 28e5d9d5..cb117059 100644
--- a/html/integration.mlmmj.pgsql.html
+++ b/html/integration.mlmmj.pgsql.html
@@ -185,7 +185,7 @@ mlmmj unix - n n - - pipe
user = vmail
password = qsescZvV03f6YUtTMN2bQTejmjatzz
hosts = 127.0.0.1
-port = 3306
+port = 5432
dbname = vmail
query = SELECT maillists.transport FROM maillists,domain WHERE maillists.address='%s' AND maillists.active=1 AND maillists.domain = domain.domain AND domain.active=1
@@ -339,7 +339,7 @@ use SQL user vmailadmin
for this purpose.
iredmail_sql_db_type = 'pgsql'
iredmail_sql_db_server = '127.0.0.1'
-iredmail_sql_db_port = 3306
+iredmail_sql_db_port = 5432
iredmail_sql_db_name = 'vmail'
iredmail_sql_db_user = 'vmailadmin'
iredmail_sql_db_password = '<password>'
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 2c2376e7..26b9386c 100644
--- a/html/upgrade.iredmail.0.9.7-0.9.8.html
+++ b/html/upgrade.iredmail.0.9.7-0.9.8.html
@@ -720,7 +720,7 @@ sasl auth. Please follow steps below to fix it.
bash /var/vmail/backup/backup_pgsql.sh
Download SQL template file used to update SQL database:
-cd /root/
+cd /tmp/
wget https://bitbucket.org/zhb/iredmail/raw/default/extra/update/0.9.8/iredmail.pgsql
@@ -729,14 +729,14 @@ wget https://bitbucket.org/zhb/iredmail/raw/default/extra/update/0.9.8/iredmail.
on FreeBSD, it's pgsql
user
* on OpenBSD, it's _postgresql
user
su - postgres
-psql -d vmail < /root/iredmail.mysql
+psql -d vmail < /tmp/iredmail.pgsql
mlmmj (mailing list manager) integration
iRedMail-0.9.8 integrates mlmmj as mailing list manager, please follow our
document below to integrate it: