diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-05-02 17:31:28 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-02 17:31:28 +0200 |
commit | 50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64 (patch) | |
tree | 64f16d207bad28a9dfda9cce95e6337483a40066 /gnu/services/dns.scm | |
parent | a8cb1e72ef351330d1521833c1b270dcc0da593f (diff) | |
parent | afc57916e5398737e13d94b3823983783221eb63 (diff) | |
download | guix-patches-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar guix-patches-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/dns.scm')
-rw-r--r-- | gnu/services/dns.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index a07946d085..478c837d13 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -748,6 +749,8 @@ cache.size = 100 * MB (default #f)) ;boolean (servers dnsmasq-configuration-servers (default '())) ;list of string + (addresses dnsmasq-configuration-addresses + (default '())) ;list of string (cache-size dnsmasq-configuration-cache-size (default 150)) ;integer (negative-cache? dnsmasq-configuration-negative-cache? @@ -759,7 +762,7 @@ cache.size = 100 * MB no-hosts? port local-service? listen-addresses resolv-file no-resolv? servers - cache-size negative-cache?) + addresses cache-size negative-cache?) (shepherd-service (provision '(dnsmasq)) (requirement '(networking)) @@ -783,6 +786,8 @@ cache.size = 100 * MB '()) #$@(map (cut format #f "--server=~a" <>) servers) + #$@(map (cut format #f "--address=~a" <>) + addresses) #$(format #f "--cache-size=~a" cache-size) #$@(if negative-cache? '() |