me/guix
Archived
1
0
Fork 0
Code Activity

services: mail: Deprecate 'dovecot-service' procedure.

Browse source 
* doc/guix.texi (Mail Services): Replace 'dovecot-service' with 'dovecot-service-type'.
* gnu/services/mail.scm (dovecot-service-type): Set default value.
(dovecot-service): Deprecate procedure.
* gnu/tests/mail.scm (%dovecot-os): Use dovecot-service-type.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Bruno Victal 2023-02-25 18:58:08 +00:00 • committed by Ludovic Courtès
parent be1435d668
commit c6cbce9ad8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/guix.texi
View file

@ -24709,9 +24709,10 @@ in the subsections below.
@subsubheading Dovecot Service @subsubheading Dovecot Service
@deffn {Scheme Procedure} dovecot-service [#:config (dovecot-configuration)] @defvar dovecot-service-type
Return a service that runs the Dovecot IMAP/POP3/LMTP mail server. Type for the service that runs the Dovecot IMAP/POP3/LMTP mail server,
@end deffn whose value is a @code{<dovecot-configuration>} object.
@end defvar
By default, Dovecot does not need much configuration; the default By default, Dovecot does not need much configuration; the default
configuration object created by @code{(dovecot-configuration)} will configuration object created by @code{(dovecot-configuration)} will
@ -24726,7 +24727,7 @@ For example, to specify that mail is located at @code{maildir~/.mail},
one would instantiate the Dovecot service like this: one would instantiate the Dovecot service like this:
@lisp @lisp
(dovecot-service #:config (service dovecot-service-type
(dovecot-configuration (dovecot-configuration
(mail-location "maildir:~/.mail"))) (mail-location "maildir:~/.mail")))
@end lisp @end lisp

9
gnu/services/mail.scm
View file

@ -35,6 +35,7 @@
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages dav) #:use-module (gnu packages dav)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (guix deprecation)
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix packages) #:use-module (guix packages)
@ -42,7 +43,7 @@
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:export (dovecot-service #:export (dovecot-service ; deprecated
dovecot-service-type dovecot-service-type
dovecot-configuration dovecot-configuration
opaque-dovecot-configuration opaque-dovecot-configuration
@ -1601,9 +1602,11 @@ greyed out, instead of only later giving \"not selectable\" popup error.
(service-extension activation-service-type (service-extension activation-service-type
%dovecot-activation))) %dovecot-activation)))
(description "Run Dovecot, a mail server that can run POP3, (description "Run Dovecot, a mail server that can run POP3,
IMAP, and LMTP."))) IMAP, and LMTP.")
(default-value (dovecot-configuration))))
(define* (dovecot-service #:key (config (dovecot-configuration))) (define-deprecated (dovecot-service #:key (config (dovecot-configuration)))
dovecot-service-type
"Return a service that runs @command{dovecot}, a mail server that can run "Return a service that runs @command{dovecot}, a mail server that can run
POP3, IMAP, and LMTP. @var{config} should be a configuration object created POP3, IMAP, and LMTP. @var{config} should be a configuration object created
by @code{dovecot-configuration}. @var{config} may also be created by by @code{dovecot-configuration}. @var{config} may also be created by

2
gnu/tests/mail.scm
View file

@ -293,7 +293,7 @@ acl_check_data:
(define %dovecot-os (define %dovecot-os
(simple-operating-system (simple-operating-system
(service dhcp-client-service-type) (service dhcp-client-service-type)
(dovecot-service #:config (service dovecot-service-type
(dovecot-configuration (dovecot-configuration
(disable-plaintext-auth? #f) (disable-plaintext-auth? #f)
(ssl? "no") (ssl? "no")