bump version to 5.0-15

diff --git a/Makefile b/Makefile
index 846284991500cb093539d0984b9d0c975e1afe3b..fe97c91b280ffc12dc70a2ad080543310c874a20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GEN_PACKAGE=pmg-doc-generator
 DOC_PACKAGE=pmg-docs
 
 # also update debian/changelog
-PKGREL=14
+PKGREL=15
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 

diff --git a/debian/changelog b/debian/changelog
index f1b54f3c8b6ef40b1f3806a207aaff0a5c4e3278..af3b255748d02f8a9183f956bbf4b0a7166b4635 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pmg-docs (5.0-15) unstable; urgency=medium
+
+  * gen-pmg.conf.5-opts.pl: add dnsbl_threshold to known parameters
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 21 Jun 2018 10:20:22 +0200
+
 pmg-docs (5.0-14) unstable; urgency=medium
 
   * update generated docs

diff --git a/pmg.conf.5-opts.adoc b/pmg.conf.5-opts.adoc
index b64f218d66253ef1d696f903b1dfe08c7d735f00..0ea211000a777da1c5fe6154c58e10d744ef5c4d 100644 (file)
--- a/pmg.conf.5-opts.adoc
+++ b/pmg.conf.5-opts.adoc
@@ -84,6 +84,10 @@ The maximal number of connection attempts any client is allowed to make to this
 
 Optional list of DNS white/blacklist domains (see postscreen_dnsbl_sites parameter).
 
+`dnsbl_threshold`: `<integer> (0 - N)` ('default =' `1`)::
+
+The inclusive lower bound for blocking a remote SMTP client, based on its combined DNSBL score (see postscreen_dnsbl_threshold parameter).
+
 `dwarning`: `<integer> (0 - N)` ('default =' `4`)::
 
 SMTP delay warning time (in hours).

diff --git a/pmg.mail-options-conf-opts.adoc b/pmg.mail-options-conf-opts.adoc
index 207c95dd09887511493fbb92d97468674f4a4e64..cdcf8b1109167eca2368607badad6896125cfac9 100644 (file)
--- a/pmg.mail-options-conf-opts.adoc
+++ b/pmg.mail-options-conf-opts.adoc
@@ -14,6 +14,10 @@ The maximal number of connection attempts any client is allowed to make to this
 
 Optional list of DNS white/blacklist domains (see postscreen_dnsbl_sites parameter).
 
+`dnsbl_threshold`: `<integer> (0 - N)` ('default =' `1`)::
+
+The inclusive lower bound for blocking a remote SMTP client, based on its combined DNSBL score (see postscreen_dnsbl_threshold parameter).
+
 `dwarning`: `<integer> (0 - N)` ('default =' `4`)::
 
 SMTP delay warning time (in hours).