From patchwork Tue Dec 21 20:18:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Dehnel X-Patchwork-Id: 35529 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A750A27BBEA; Tue, 21 Dec 2021 20:19:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 30F7527BBE9 for ; Tue, 21 Dec 2021 20:19:16 +0000 (GMT) Received: from localhost ([::1]:43168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzlbP-0002XH-BE for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 15:19:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzlbC-0002T3-Ft for guix-patches@gnu.org; Tue, 21 Dec 2021 15:19:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzlbC-0001SQ-5x for guix-patches@gnu.org; Tue, 21 Dec 2021 15:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzlbC-00021G-19 for guix-patches@gnu.org; Tue, 21 Dec 2021 15:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52689] [PATCH] services: wireguard: Add DNS config field. References: <20211220235153.20101-1-ncdehnel@gmail.com> In-Reply-To: <20211220235153.20101-1-ncdehnel@gmail.com> Resent-From: Nathan Dehnel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 20:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52689 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52689@debbugs.gnu.org Cc: Nathan Dehnel Received: via spool by 52689-submit@debbugs.gnu.org id=B52689.16401179317747 (code B ref 52689); Tue, 21 Dec 2021 20:19:01 +0000 Received: (at 52689) by debbugs.gnu.org; 21 Dec 2021 20:18:51 +0000 Received: from localhost ([127.0.0.1]:55789 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlb1-00020s-0i for submit@debbugs.gnu.org; Tue, 21 Dec 2021 15:18:51 -0500 Received: from mail-ot1-f52.google.com ([209.85.210.52]:36355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzlaz-00020d-KG for 52689@debbugs.gnu.org; Tue, 21 Dec 2021 15:18:49 -0500 Received: by mail-ot1-f52.google.com with SMTP id w6-20020a9d77c6000000b0055e804fa524so18127774otl.3 for <52689@debbugs.gnu.org>; Tue, 21 Dec 2021 12:18:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=O8dino611A5lw/XQ1ll4SjqZoWkiWcU/gvap+29j2J0=; b=NL137k0qOFYbNjbmzWmifJRoHppJ9LLSh2LWxWz18OikymVtOkIViqG5mXSy9Xy6Jt PFrHmTh+yDl2wFUw8rChuP81cXWWlpH5dGyaA0FE6BgvXm/Yri1+QSuONUVSe8C76HC/ V5JeBAe4mjy8TwdzptBy13uUX6oBzdJk1e0UbZdS6icLNjsltuhq1+1ZtSsBBBvTS8WX zZUrgG4wkdc9KSRAD+Nm3Fa3tuuDUWJy97hlGixaX+VM0mdkP4lRpImYL1n/9WVSGKLi PQn9MDYsGonIu79t18u/48sDJu6ZGkA+dZrg3oGKas1bRRZtsUBfPsYmEb1jnXzw7N8X f0vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=O8dino611A5lw/XQ1ll4SjqZoWkiWcU/gvap+29j2J0=; b=dMegW8IyEDfuASUM+JJIdgORbuWeQbnf4RAdphC9aZ3AcdgyB82KypU1ODYMAeq/EP 3yZ9Pj+KkeZ09zPgJ2m3UFyFgQlidMdXpEYgmHK1RQAneCcRrw4QYPDjMgsaWiZiAz7K Fnag4BZ2Ahd7ZuGjcYCw6Z7HZEqHFuERiuURceCmkPjov9SZumYdIISvpybcW4zC73Pz r4YdML12dR/bizFBbF7Q0u9gECVIQJV7981PB0X7kTfSnnS6NnZ4tDtmvhZrgDWxofyt 5pBwMK8OfVJhgH/TqOHO8YOMjVBMHpG3qdz1z9+L9rv+OcuwnD547BZIgmu77xpkeIbX TiHA== X-Gm-Message-State: AOAM531mBWSA4d+7/kTkvyL/XtrXlO4FR3RWcT1uVVPGQlhVCKixoWjd Q/kRWI/U3C0Q9HL2uHl4Td3bILeznpk= X-Google-Smtp-Source: ABdhPJwGNfM0zzlLCjbsfbqdzPclDJ7mYodt05hj/EnBwJO2IbIDkTo+dtBvFZCo5p6aJGVloTcs3g== X-Received: by 2002:a9d:7d83:: with SMTP id j3mr23831otn.236.1640117923766; Tue, 21 Dec 2021 12:18:43 -0800 (PST) Received: from guixlaptop.austin.rr.com (cpe-70-123-155-155.austin.res.rr.com. [70.123.155.155]) by smtp.googlemail.com with ESMTPSA id y12sm4446206oiv.49.2021.12.21.12.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 12:18:43 -0800 (PST) From: Nathan Dehnel Date: Tue, 21 Dec 2021 14:18:22 -0600 Message-Id: <20211221201822.15656-1-ncdehnel@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/vpn.scm (wireguard-configuration): Add dns field * doc/guix.texi: Document dns field --- Redid the patch to change the comment from string to list of strings doc/guix.texi | 3 +++ gnu/services/vpn.scm | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index aca88cdada..8e9cd8df18 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28601,6 +28601,9 @@ The IP addresses to be assigned to the above interface. @item @code{port} (default: @code{51820}) The port on which to listen for incoming connections. +@item @code{dns} (default: @code{#f}) +The DNS server(s) to announce to VPN clients via DHCP. + @item @code{private-key} (default: @code{"/etc/wireguard/private.key"}) The private key file for the interface. It is automatically generated if the file does not exist. diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 6004e41d8d..4ea9bcc12e 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -67,6 +67,7 @@ (define-module (gnu services vpn) wireguard-configuration-interface wireguard-configuration-addresses wireguard-configuration-port + wireguard-configuration-dns wireguard-configuration-private-key wireguard-configuration-peers @@ -715,7 +716,9 @@ (define-record-type* (private-key wireguard-configuration-private-key ;string (default "/etc/wireguard/private.key")) (peers wireguard-configuration-peers ;list of - (default '()))) + (default '())) + (dns wireguard-configuration-dns ;list of strings + (default #f))) (define (wireguard-configuration-file config) (define (peer->config peer) @@ -739,7 +742,7 @@ (define (peer->config peer) "\n")))) (match-record config - (wireguard interface addresses port private-key peers) + (wireguard interface addresses port private-key peers dns) (let* ((config-file (string-append interface ".conf")) (peers (map peer->config peers)) (config @@ -755,6 +758,7 @@ (define (peer->config peer) Address = ~a PostUp = ~a set %i private-key ~a ~a +~a ~{~a~^~%~}" #$(string-join addresses ",") #$(file-append wireguard "/bin/wg") @@ -762,6 +766,9 @@ (define (peer->config peer) #$(if port (format #f "ListenPort = ~a" port) "") + #$(if dns + (format #f "DNS = ~a" (string-join dns ",")) + "") (list #$@peers))))))))) (file-append config "/" config-file))))