From: jmc <jmc@openbsd.org>
Date: Sun, 22 Jul 2018 17:09:43 +0000 (+0000)
Subject: document method=https, and use it in the example config;
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b678ce2ec1b223253af705153ade51506638c49d;p=openbsd

document method=https, and use it in the example config;
from lauri tirkkonen;

ok sthen beck
---

diff --git a/etc/mail/spamd.conf b/etc/mail/spamd.conf
index b080300d952..1334e041607 100644
--- a/etc/mail/spamd.conf
+++ b/etc/mail/spamd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: spamd.conf,v 1.8 2016/06/01 21:55:47 sthen Exp $
+# $OpenBSD: spamd.conf,v 1.9 2018/07/22 17:09:43 jmc Exp $
 #
 # spamd(8) configuration file, read by spamd-setup(8).
 # See also spamd.conf(5).
@@ -27,7 +27,7 @@ nixspam:\
 	:black:\
 	:msg="Your address %A is in the nixspam list\n\
 	See http://www.heise.de/ix/nixspam/dnsbl_en/ for details":\
-	:method=http:\
+	:method=https:\
 	:file=www.openbsd.org/spamd/nixspam.gz
 
 # An example of a list containing addresses which should not talk to spamd.
diff --git a/share/man/man5/spamd.conf.5 b/share/man/man5/spamd.conf.5
index 27899d50a80..db7742afc8d 100644
--- a/share/man/man5/spamd.conf.5
+++ b/share/man/man5/spamd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd.conf.5,v 1.21 2017/07/13 19:16:33 jmc Exp $
+.\"	$OpenBSD: spamd.conf.5,v 1.22 2018/07/22 17:09:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" Copyright (c) 2003 Bob Beck
@@ -24,7 +24,7 @@
 .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 13 2017 $
+.Dd $Mdocdate: July 22 2018 $
 .Dt SPAMD.CONF 5
 .Os
 .Sh NAME
@@ -57,7 +57,7 @@ nixspam:\e
 	:black:\e
 	:msg="Your address %A is in the nixspam list\en\e
 	See http://www.heise.de/ix/nixspam/dnsbl_en/ for details":\e
-	:method=http:\e
+	:method=https:\e
 	:file=www.openbsd.org/spamd/nixspam.gz
 
 override:\e
@@ -123,12 +123,14 @@ capability entries.
 specifies the method by which to retrieve a file containing a list of
 addresses and may be one of
 .Ar http ,
+.Ar https ,
 .Ar ftp ,
 .Ar file ,
 or
 .Ar exec .
 The
 .Ar http ,
+.Ar https ,
 .Ar ftp ,
 and
 .Ar file