diff options
| author | 宋文武 <iyzsong@member.fsf.org> | 2018-06-08 23:12:37 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2018-06-08 23:32:49 +0800 |
| commit | c061eb587cbb8590a5cd4793b56a01560af747a8 (patch) | |
| tree | 40e7c41d36faf7a5a9de0cb508c661c24785a43f | |
| parent | 129948dcbda91d4449b56e3816eede249e34afb6 (diff) | |
| download | guix-c061eb587cbb8590a5cd4793b56a01560af747a8.tar.gz guix-c061eb587cbb8590a5cd4793b56a01560af747a8.zip | |
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.
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | gnu/services/dns.scm | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 1183565ad3..965ac420ff 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -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 diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index d0913e90ed..1b39d0f508 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -622,8 +622,8 @@ (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 @@ 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 @@ #$@(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)))))) |