diff options
| author | Sören Tempel <soeren@soeren-tempel.net> | 2025-01-13 07:12:43 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-01-16 12:51:48 +0100 |
| commit | ac6aba1fd7204e8850787bad3a5c9ecc6baad1ee (patch) | |
| tree | 3d07f60d2bcd0a648070377678f47a8105b1040f | |
| parent | 145b51aeb35b02f0eb43ef3c31d0b2b77551424e (diff) | |
services: dns: Minor cleanup of unbound service.
In #68757, v3 instead of v4 of the patchset was committed by accident.
This patch revives the (minor) changes made in the v4.
* gnu/service/dns.scm: Remove exports of no longer existing names.
(unbound-service-type): Fix at typo (unbound -> Unbound).
(unbound-shepherd-service): Run after user processes.
(unbound-account-service): Determine shell based on shadow package.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/services/dns.scm | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index c74001fac2..dcfb90235c 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -56,18 +56,14 @@ dnsmasq-configuration unbound-service-type - unbound-zone - unbound-server unbound-configuration unbound-configuration? - unbound-configuration-server - unbound-configuration-remote-control - unbound-configuration-forward-zone - unbound-configuration-stub-zone - unbound-configuration-auth-zone - unbound-configuration-view - unbound-configuration-python - unbound-configuration-dynlib)) + unbound-server + unbound-server? + unbound-zone + unbound-zone? + unbound-remote + unbound-remote?)) ;;; ;;; Knot DNS. @@ -1065,7 +1061,9 @@ cache.size = 100 * MB (list (shepherd-service (documentation "Unbound daemon.") (provision '(unbound dns)) - (requirement '(networking)) + ;; unbound may be bound to a particular IP address, hence + ;; only start it after the networking service has started. + (requirement '(user-processes networking)) (actions (list (shepherd-configuration-action config-file))) (start #~(make-forkexec-constructor (list (string-append #$unbound "/sbin/unbound") @@ -1080,11 +1078,11 @@ cache.size = 100 * MB (system? #t) (comment "Unbound daemon user") (home-directory "/var/empty") - (shell "/run/current-system/profile/sbin/nologin")))) + (shell (file-append shadow "/sbin/nologin"))))) (define unbound-service-type (service-type (name 'unbound) - (description "Run the unbound DNS resolver.") + (description "Run the Unbound DNS resolver.") (extensions (list (service-extension account-service-type (const unbound-account-service)) |