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: dnsmasq: Use 'negative-cache?' instead of 'no-negcache?'.

Browse source 
The 'no-negcache?' option is mapped to the '--no-negcache' command-line
argument directly, but we're in the scheme world, where the general guideline
is to avoid double-negations in identifiers.

* gnu/services/dns.scm <dnsmasq-configuration>: Replace the 'no-negcache?'
field with 'negative-cache?'.
* doc/guix.texi (DNS Services)[Dnsmasq Service]: Adjust accordingly.
This commit is contained in:
宋文武 2018-06-08 23:12:37 +08:00
parent 129948dcbd
commit c061eb587c
No known key found for this signature in database
GPG key ID: 26525665AE727D37
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/guix.texi
View file

@ -16858,8 +16858,8 @@ Specify IP address of upstream servers directly.
Set the size of dnsmasq's cache. Setting the cache size to zero
disables caching.
@item @code{no-negcache?} (default: @code{#f})
When true, disable negative caching.
@item @code{negative-cache?} (default: @code{#t})
When false, disable negative caching.
@end table
@end deftp

12
gnu/services/dns.scm
View file

@ -622,8 +622,8 @@ (define-record-type* <dnsmasq-configuration>
(default '())) ;list of string
(cache-size dnsmasq-configuration-cache-size
(default 150)) ;integer
(no-negcache? dnsmasq-configuration-no-negcache?
(default #f))) ;boolean
(negative-cache? dnsmasq-configuration-negative-cache?
(default #t))) ;boolean
(define dnsmasq-shepherd-service
(match-lambda
@ -631,7 +631,7 @@ (define dnsmasq-shepherd-service
no-hosts?
port local-service? listen-addresses
resolv-file no-resolv? servers
cache-size no-negcache?)
cache-size negative-cache?)
(shepherd-service
(provision '(dnsmasq))
(requirement '(networking))
@ -656,9 +656,9 @@ (define dnsmasq-shepherd-service
#$@(map (cut format #f "--server=~a" <>)
servers)
#$(format #f "--cache-size=~a" cache-size)
#$@(if no-negcache?
'("--no-negcache")
'()))
#$@(if negative-cache?
'()
'("--no-negcache")))
#:pid-file "/run/dnsmasq.pid"))
(stop #~(make-kill-destructor))))))