From 8619bf1c47595b48fde3e64b909775f373db89a3 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Sat, 20 Apr 2019 14:26:43 +0800
Subject: [PATCH] Fix incorrect iredapd plugin names.
---
en_US/howto/force.user.to.change.password.md | 8 ++++----
html/force.user.to.change.password.html | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/en_US/howto/force.user.to.change.password.md b/en_US/howto/force.user.to.change.password.md
index db9f7d8f..bc1fd5e2 100644
--- a/en_US/howto/force.user.to.change.password.md
+++ b/en_US/howto/force.user.to.change.password.md
@@ -13,9 +13,9 @@ last change date will be set to `0000-00-00 00:00:00`.
iRedAPD has plugin to force mail users to change password before sending email:
-* `sql_force_change_password_in_days`: for SQL backends (MySQL, MariaDB and
+* `sql_force_change_password`: for SQL backends (MySQL, MariaDB and
PostgreSQL).
-* `ldap_force_change_password_in_days`: for LDAP backends (OpenLDAP and OpenBSD
+* `ldap_force_change_password`: for LDAP backends (OpenLDAP and OpenBSD
built-in LDAP server `ldapd(8)`).
When user trying to send an email, iRedAPD will invoke this plugin to
@@ -30,10 +30,10 @@ To enable this plugin, please list the plugin name in iRedAPD config file
```python
# For SQL backends
-plugins = [..., 'sql_force_change_password_in_days']
+plugins = [..., 'sql_force_change_password']
# For LDAP backends:
-plugins = [..., 'ldap_force_change_password_in_days']
+plugins = [..., 'ldap_force_change_password']
```
There're two optional settings you can set in `/opt/iredapd/settings.py`:
diff --git a/html/force.user.to.change.password.html b/html/force.user.to.change.password.html
index bed076a7..771449b8 100644
--- a/html/force.user.to.change.password.html
+++ b/html/force.user.to.change.password.html
@@ -35,9 +35,9 @@ didn't change password before, or user account is newly created, the password
last change date will be set to 0000-00-00 00:00:00
.
iRedAPD has plugin to force mail users to change password before sending email:
-sql_force_change_password_in_days
: for SQL backends (MySQL, MariaDB and
+sql_force_change_password
: for SQL backends (MySQL, MariaDB and
PostgreSQL).
-ldap_force_change_password_in_days
: for LDAP backends (OpenLDAP and OpenBSD
+ldap_force_change_password
: for LDAP backends (OpenLDAP and OpenBSD
built-in LDAP server ldapd(8)
).
When user trying to send an email, iRedAPD will invoke this plugin to
@@ -48,10 +48,10 @@ days, this plugin rejects smtp session with specified message.
To enable this plugin, please list the plugin name in iRedAPD config file
/opt/iredapd/settings.py
, variable plugins =
. For example:
# For SQL backends
-plugins = [..., 'sql_force_change_password_in_days']
+plugins = [..., 'sql_force_change_password']
# For LDAP backends:
-plugins = [..., 'ldap_force_change_password_in_days']
+plugins = [..., 'ldap_force_change_password']
There're two optional settings you can set in /opt/iredapd/settings.py
: