nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: dnsmasq: Use 'negative-cache?' instead of 'no-negcache?'. 

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 Set the size of dnsmasq's cache. Setting the cache size to zero
disables caching. disables caching.
@item @code{no-negcache?} (default: @code{#f}) @item @code{negative-cache?} (default: @code{#t})
When true, disable negative caching. When false, disable negative caching.
@end table @end table
@end deftp @end deftp

12
gnu/services/dns.scm
View File

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