ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: Use the new maybe/unset API.

Browse source 
* gnu/home/services/ssh.scm (serialize-address-family): Use the public API of
the maybe infrastructure.
* gnu/services/file-sharing.scm (serialize-maybe-string): Use maybe-value.
(serialize-maybe-file-object): Use maybe-value-set?.
* gnu/services/getmail.scm (getmail-retriever-configuration): Don't use
internals in unset field declarations.
(getmail-destination-configuration): Ditto.
* gnu/services/messaging.scm (raw-content?): Use maybe-value-set?.
(prosody-configuration): Use %unset-value.
* gnu/services/telephony.scm (jami-shepherd-services): Use maybe-value-set?.
(archive-name->username): Use maybe-value-set?.
* tests/services/configuration.scm ("maybe type, no default"): Use
%unset-value.

Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Attila Lendvai 2022-08-24 14:40:41 +02:00 committed by Maxim Cournoyer
parent cc32cd41f7
commit ee08277a70
No known key found for this signature in database
GPG key ID: 1260E46482E63562
8 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/home/services/ssh.scm
View file

@ -69,17 +69,19 @@ (define (serialize-string field value)
" " value "\n"))
(define (address-family? obj)
(memv obj (list 'unset AF_INET AF_INET6)))
(memv obj (list AF_INET AF_INET6)))
(define-maybe address-family)
(define (serialize-address-family field family)
(if (eq? 'unset family)
""
(if (maybe-value-set? family)
(string-append " " (serialize-field-name field) " "
(cond ((= family AF_INET) "inet")
((= family AF_INET6) "inet6")
;; The 'else' branch is unreachable.
(else (raise (condition (&error)))))
"\n")))
"\n")
""))
(define (natural-number? obj)
(and (integer? obj) (exact? obj) (> obj 0)))
@ -115,7 +117,7 @@ (define-configuration openssh-host
maybe-string
"Host name---e.g., @code{\"foo.example.org\"} or @code{\"192.168.1.2\"}.")
(address-family
address-family
maybe-address-family
"Address family to use when connecting to this host: one of
@code{AF_INET} (for IPv4 only), @code{AF_INET6} (for IPv6 only).
Additionally, the field can be left unset to allow any address family.")

11
gnu/services/file-sharing.scm
View file

@ -114,10 +114,7 @@ (define-maybe string)
;; name-value pair for the JSON builder.
(set! serialize-maybe-string
(lambda (field-name val)
(serialize-string field-name
(if (eq? val 'unset)
""
val))))
(serialize-string field-name (maybe-value val ""))))
(define (string-list? val)
(and (list? val)
@ -180,9 +177,9 @@ (define (serialize-file-object field-name val)
(define-maybe file-object)
(set! serialize-maybe-file-object
(lambda (field-name val)
(if (eq? val 'unset)
(serialize-string field-name "")
(serialize-file-object field-name val))))
(if (maybe-value-set? val)
(serialize-file-object field-name val)
(serialize-string field-name ""))))
(define (file-object-list? val)
(and (list? val)

6
gnu/services/getmail.scm
View file

@ -111,10 +111,10 @@ (define-configuration getmail-retriever-configuration
"The type of mail retriever to use. Valid values include
@samp{passwd} and @samp{static}.")
(server
(string 'unset)
string
"Name or IP address of the server to retrieve mail from.")
(username
(string 'unset)
string
"Username to login to the mail server with.")
(port
(non-negative-integer #f)
@ -143,7 +143,7 @@ (define (serialize-getmail-destination-configuration field-name val)
(define-configuration getmail-destination-configuration
(type
(string 'unset)
string
"The type of mail destination. Valid values include @samp{Maildir},
@samp{Mboxrd} and @samp{MDA_external}.")
(path

1
gnu/services/kerberos.scm
View file

@ -39,6 +39,7 @@ (define-module (gnu services kerberos)
;; TODO Use %unset-value and the define-maybe infrastructure.
(define unset-field (list 'unset-field))
(define (predicate/unset pred)

15
gnu/services/messaging.scm
View file

@ -90,6 +90,11 @@ (define (make-pred arg)
((new-def ...)
(map (lambda (def target)
(if (eq? 'common (syntax->datum target))
;; TODO Use the %unset-value variable, or
;; even better just simplify this so that it
;; doesn't interfere with
;; define-configuration and define-maybe
;; internals.
#''unset def))
#'(def ...) #'(target ...)))
((new-doc ...)
@ -200,7 +205,7 @@ (define (serialize-file-object-list field-name val)
(define-maybe file-object-list)
(define (raw-content? val)
(not (eq? val 'unset)))
(maybe-value-set? val))
(define (serialize-raw-content field-name val)
val)
(define-maybe raw-content)
@ -474,12 +479,12 @@ (define-all-configurations prosody-configuration
global)
(http-max-content-size
(maybe-non-negative-integer 'unset)
(maybe-non-negative-integer %unset-value)
"Maximum allowed size of the HTTP body (in bytes)."
common)
(http-external-url
(maybe-string 'unset)
(maybe-string %unset-value)
"Some modules expose their own URL in various ways. This URL is built
from the protocol, host and port used. If Prosody sits behind a proxy, the
public URL will be @code{http-external-url} instead. See
@ -556,7 +561,7 @@ (define-all-configurations prosody-configuration
int-component)
(mod-muc
(maybe-mod-muc-configuration 'unset)
(maybe-mod-muc-configuration %unset-value)
"Multi-user chat (MUC) is Prosody's module for allowing you to create
hosted chatrooms/conferences for XMPP users.
@ -573,7 +578,7 @@ (define-all-configurations prosody-configuration
ext-component)
(raw-content
(maybe-raw-content 'unset)
(maybe-raw-content %unset-value)
"Raw content that will be added to the configuration file."
common)))

2
gnu/services/networking.scm
View file

@ -772,7 +772,7 @@ (define-configuration/no-serialization opendht-configuration
network. A specific port value can be provided by appending the @code{:PORT}
suffix. By default, it uses the Jami bootstrap nodes, but any host can be
specified here. It's also possible to disable bootstrapping by explicitly
setting this field to the @code{'unset} value.")
setting this field to @code{%unset-value}.")
(port
(maybe-number 4222)
"The UDP port to bind to. When left unspecified, an available port is

6
gnu/services/telephony.scm
View file

@ -307,7 +307,7 @@ (define (jami-shepherd-services config)
(dbus (jami-configuration-dbus config))
(dbus-daemon (file-append dbus "/bin/dbus-daemon"))
(accounts (jami-configuration-accounts config))
(declarative-mode? (not (eq? 'unset accounts))))
(declarative-mode? (maybe-value-set? accounts)))
(with-extensions (list guile-packrat ;used by guile-ac-d-bus
guile-ac-d-bus
@ -649,7 +649,7 @@ (define (archive-name->username archive)
account-details)
(let ((username (archive-name->username
archive)))
(when (not (eq? 'unset allowed-contacts))
(when (not (eq? '#$%unset-value allowed-contacts))
;; Reject calls from unknown contacts.
(set-account-details
'(("DHT.PublicInCalls" . "false")) username)
@ -659,7 +659,7 @@ (define (archive-name->username archive)
;; Add allowed ones.
(for-each (cut add-contact <> username)
allowed-contacts))
(when (not (eq? 'unset moderators))
(when (not (eq? '#$%unset-value moderators))
;; Disable the 'AllModerators' property.
(set-all-moderators #f username)
;; Remove all moderators.

2
tests/services/configuration.scm
View file

@ -169,7 +169,7 @@ (define-configuration config-with-maybe-string/no-serialization
(not (defined? 'serialize-maybe-string)))
(test-assert "maybe type, no default"
(eq? 'unset
(eq? %unset-value
(config-with-maybe-string/no-serialization-name
(config-with-maybe-string/no-serialization))))