From 1ed9e770928671fbd6e95db59cfdbbf58cb651d8 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 21 Jun 2018 10:21:00 +0200 Subject: [PATCH] bump version to 5.0-15 --- Makefile | 2 +- debian/changelog | 6 ++++++ pmg.conf.5-opts.adoc | 4 ++++ pmg.mail-options-conf-opts.adoc | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8462849..fe97c91 100644 --- 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 f1b54f3..af3b255 100644 --- 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 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 b64f218..0ea2110 100644 --- 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`: ` (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`: ` (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 207c95d..cdcf8b1 100644 --- 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`: ` (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`: ` (0 - N)` ('default =' `4`):: SMTP delay warning time (in hours).