On Fri, Jul 20, 2018 at 01:09:48PM +0300, Lauri Tirkkonen wrote:
> Hi,
> 
> spamd.conf supports method=https, but this is not documented. So
> document it and also modify the example config to default to it.
> 

committed, thanks.
jmc

> diff --git a/etc/mail/spamd.conf b/etc/mail/spamd.conf
> index b080300d952..1361e864742 100644
> --- a/etc/mail/spamd.conf
> +++ b/etc/mail/spamd.conf
> @@ -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..5dd651db3a4 100644
> --- a/share/man/man5/spamd.conf.5
> +++ b/share/man/man5/spamd.conf.5
> @@ -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
> 
> -- 
> Lauri Tirkkonen | lotheac @ IRCnet
> 

Reply via email to