From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id IIDwI7w6rGViggEA62LTzQ:P1 (envelope-from ) for ; Sat, 20 Jan 2024 22:27:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id IIDwI7w6rGViggEA62LTzQ (envelope-from ) for ; Sat, 20 Jan 2024 22:27:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lnikki.la header.s=fm1 header.b="P WRGuNW"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="T 2GkNHa"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705786044; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wb6atIrtr/vM2sOcGPQYGg7yB2t17e7SIUsHSIU8z94=; b=cXOz6cQ7qL5z0rEk0Clr5xbr3eWzRgd6VyFVoy7yfskL6yyHCSqohn1vqhS5yTxCGcdc6a DjHDkG7pjXORVb1vj69IiCJmPEv0vSzVBMgEgEUxduKcUl6AIYZyTIql7LQ2mZGLuj7rOZ O4soHs/5xK9jtpfh/Zaa75D/NxBMLi+ZRHioT3fbmmOEsL8R0KgJCxObZI1QCPkY5fFcqA 6BMToTKxox7fFAxM0SS7fM+5Jp+iDY6WHhCWoZZVRSAGBIJMlDu9YI0iMtWvPXKXVMGC1+ btxFKS+tdxR1JDdol4kB6uvWh8jvy/x37bHzZ+wBoFVKsqANgqFTw/t6J/oMIA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705786044; a=rsa-sha256; cv=none; b=WwqOaWC8OS1EX1fLm8Ufs59cPfuTJo4wECHZrnknNWjueTkREplhkcfn4jSntb9nrHOFH7 TjcNUDk3wvitPaPo0hohAEJ+CaHO2jsFP6OfbfYLcmVKhDQb4VJ/zhGEq4oGOwyjgyVAbu f7OghJCuXCu4M1QygR0iNrZuqbPYNX9n1bttMvemYLNB/nzoR+IcXGMwtdEZ7cmcO+bomZ 4/sLUU/zIB1TlHRx30fbhuYo8YnsUCaZS1xEUxdx/ADrIK/jJSsn2O3FUFPIXawABXjiL1 uoCegD6Anom/9S2ebXq36e1jyiYt6GreqiuIoh0doOjGA0ATNQluefoQFsDLnw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lnikki.la header.s=fm1 header.b="P WRGuNW"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="T 2GkNHa"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4681120853 for ; Sat, 20 Jan 2024 22:27:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRIrr-0000d4-KZ; Sat, 20 Jan 2024 16:27:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRIrk-0000bk-UW for guix-patches@gnu.org; Sat, 20 Jan 2024 16:27:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rRIrk-0000GE-Lh for guix-patches@gnu.org; Sat, 20 Jan 2024 16:27:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRIrn-0008Sg-Ja for guix-patches@gnu.org; Sat, 20 Jan 2024 16:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68622] [PATCH 2/2] services: knot-resolver: Use default DNSSEC trust anchors. Resent-From: Leo =?UTF-8?Q?Nikkil=C3=A4?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jan 2024 21:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68622@debbugs.gnu.org Cc: Leo =?UTF-8?Q?Nikkil=C3=A4?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170578600132459 (code B ref -1); Sat, 20 Jan 2024 21:27:03 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jan 2024 21:26:41 +0000 Received: from localhost ([127.0.0.1]:35984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRIrQ-0008RO-P6 for submit@debbugs.gnu.org; Sat, 20 Jan 2024 16:26:41 -0500 Received: from lists.gnu.org ([2001:470:142::17]:57972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRIrO-0008Qo-Tn for submit@debbugs.gnu.org; Sat, 20 Jan 2024 16:26:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRIrA-0000B0-Sn for guix-patches@gnu.org; Sat, 20 Jan 2024 16:26:26 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rRIr7-0000BD-Ps for guix-patches@gnu.org; Sat, 20 Jan 2024 16:26:23 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 50C335C00B1; Sat, 20 Jan 2024 16:26:21 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 20 Jan 2024 16:26:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1705785981; x= 1705872381; bh=wb6atIrtr/vM2sOcGPQYGg7yB2t17e7SIUsHSIU8z94=; b=P WRGuNWV0OUv6J8tBNIC/E8qvjDjeBeIouNNaOBmz8fSXBA7i2iqSaXG6T/D8Pnmy R/toQKJ0+u9wA/Dzb6DN2SrZBz5TDul2vv3c9k9q6NoqmNknQn32MSyFZDt5hLJh 04+VyG0eK3p5wKRtTuAIJ0fiS3e47k34SQYWpQowYxNqupT1tV1fJzkmWjVuYvlH JKGER6UjwmI+s8Bf+EHLkEE03uggTtpEo44U7npdOL8GSwjThlscsB0tEjpwcQlc KUGjtcHwcupgXdcw2fmIKlWK5jI/amX2qb4U6kT3YQCJZR/CKZGnNqraDyY/s92r Wn5gcV+MDZBZZSwVFxF7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705785981; x= 1705872381; bh=wb6atIrtr/vM2sOcGPQYGg7yB2t17e7SIUsHSIU8z94=; b=T 2GkNHaK+YnwpEfpAjDN27aj/1ks/4PDZVhbZ9ADAc5lP1ScUx4w+8waEa1hJM9Tb 5/JsJC61o5yZGM7EMBt8FoBKLiZcjkZL9MTDvGI+HgZm0eITVpcAgRtfZOFwpwaY Hmxa6H0prsCc1qhdd1BjGCzDue0tUWPBJ2gfcbJ1bQCMpBaAVODUdpUXSrSTCrFL Trg4X3jrHLHRD05PeQyBs3uRG3LKZyyB8/9eD5BeXL9l54EmxvXntbmZ6vYs2c1q pn3BLibx2YIsOzcb5q2DcHSXowyZBjLPn+F17RzpQnPe4766tq2lo58L4x2yMN2m 7JvSvV75nIZrhkpjRytsA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdekvddgudehtdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestd ekredtredtjeenucfhrhhomhepnfgvohcupfhikhhkihhlmocuoehhvghllhhosehlnhhi khhkihdrlhgrqeenucggtffrrghtthgvrhhnpedvgefgvedtieefhfetieffudffudehte dtueelveefleeggedvveehledutdeltdenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehhvghllhhosehlnhhikhhkihdrlhgr X-ME-Proxy: Feedback-ID: i41f146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 20 Jan 2024 16:26:20 -0500 (EST) Date: Sat, 20 Jan 2024 23:23:44 +0200 Message-ID: <20240120212542.17473-3-hello@lnikki.la> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240120212542.17473-1-hello@lnikki.la> References: <20240120212542.17473-1-hello@lnikki.la> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.25; envelope-from=hello@lnikki.la; helo=out1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Leo =?UTF-8?Q?Nikkil=C3=A4?= X-ACL-Warn: , =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= From: =?utf-8?q?Leo_Nikkil=C3=A4_via_Guix-patches?= via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.78 X-Spam-Score: -6.78 X-Migadu-Queue-Id: 4681120853 X-TUID: r/wTasfPe93U * gnu/services/dns.scm (%kresd.conf): Use default anchors. (knot-resolver-activation): Install default anchors when missing. --- gnu/services/dns.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 6608046909..f83c5b6594 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -655,7 +655,6 @@ (define-record-type* (define %kresd.conf (plain-file "kresd.conf" "-- -*- mode: lua -*- -trust_anchors.add_file('/var/cache/knot-resolver/root.keys') net = { '127.0.0.1', '::1' } user('knot-resolver', 'knot-resolver') modules = { 'hints > iterate', 'stats', 'predict' } @@ -676,10 +675,20 @@ (define %knot-resolver-accounts (define (knot-resolver-activation config) #~(begin (use-modules (guix build utils)) - (let ((rundir "/var/cache/knot-resolver") - (owner (getpwnam "knot-resolver"))) + (let* ((rundir "/var/cache/knot-resolver") + (keyfile (string-append rundir "/root.keys")) + (owner (getpwnam "knot-resolver"))) (mkdir-p rundir) - (chown rundir (passwd:uid owner) (passwd:gid owner))))) + (chown rundir (passwd:uid owner) (passwd:gid owner)) + + ;; Install initial trust anchors when missing. + (unless (file-exists? keyfile) + (copy-file #$(file-append (knot-resolver-configuration-package + config) + "/etc/knot-resolver/root.keys") + keyfile) + (chown keyfile (passwd:uid owner) (passwd:gid owner)) + (chmod keyfile #o755))))) (define knot-resolver-shepherd-services (match-lambda -- 2.41.0