From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gAC7KJ4YGGcHcgAAqHPOHw:P1 (envelope-from ) for ; Tue, 22 Oct 2024 21:26:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id gAC7KJ4YGGcHcgAAqHPOHw (envelope-from ) for ; Tue, 22 Oct 2024 23:26:54 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RH40U7rL; dkim=fail ("headers rsa verify failed") header.d=freakingpenguin.com header.s=x header.b=SUpNCtut; dmarc=none; 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-Seal: i=1; s=key1; d=yhetil.org; t=1729632414; a=rsa-sha256; cv=none; b=hqnbI8GOweK/CAqbLTt3XHg8N53nRg2LeJX7f+03QhcTr/WLeqWnoWzWfh5VlL2XG46GEp JNvV/eUr5G4CELdfoAB1AZkLNGHf8kGZJl8PLpdtgjke16HJeyukcqhzA1sxMNh/cHZOnc +e7u3Difmrb4sMkAWR5JAM4GjY0r8s1mpNcBOMvP1Jkyfbv8u63KFyF45q1441k+y+WpeM ldi2es/2RcdV+ZaOstdSb9gttV2Lk3hmryNAaVSAF0HnBkPRrKm08V34yo6C+msWw7acM6 mLR7nQAO2WKt5PbOS2pkObBcfnJSYEeZwjnG/fZGwVZR8P08nFKRn8Mj0gpHqQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RH40U7rL; dkim=fail ("headers rsa verify failed") header.d=freakingpenguin.com header.s=x header.b=SUpNCtut; dmarc=none; 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=1729632414; h=from:from:sender:sender: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=lq2h9XrWM9WXMxvdRNIZU0rAGmv5q5v/5QrryLEibbA=; b=B2+CrJCAW16gzLWxBqhctP1pCW5u/36k1pGuTa934K/sL/UM06wsaUVDsrLjtuDqinGAoF mGb8vZt4LU6wOQVwG72kO6hqSvUOHah/DKYTlgwsQt2dOTmM9IGb3yxytfbzIRQW/Xkcxc pVFaXPvFJZTBfdah7yyX8dMVHdzw4yCP7ZQWCy72GnVFTEvM9TOY7dWGXNR4EETIASIdmf RtsVTuhjZ9ZBWGTZnPHDJLFiC44CnfBacg0qtPvqaq3Xn7McuMrNp7Tcim2Lkyj5sx+hu9 WpdnoWWTDM2bRXnNoRDqYqwGq3fXWTOwr4csJsm1OH5tjVnQZA8gM6UBMAk1bQ== 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 CD7118CF8B for ; Tue, 22 Oct 2024 23:26:53 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3MOh-0003QU-L1; Tue, 22 Oct 2024 17:26:35 -0400 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 1t3MOg-0003QL-HJ for guix-patches@gnu.org; Tue, 22 Oct 2024 17:26:34 -0400 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 1t3MOg-0005ay-8O for guix-patches@gnu.org; Tue, 22 Oct 2024 17:26:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=lq2h9XrWM9WXMxvdRNIZU0rAGmv5q5v/5QrryLEibbA=; b=RH40U7rLTdwKDkR7YtB54ubmo+Et3fZR8r5WAuf7LTmwg92JTKq3vi2IZBeDbnIKGwW9BLUOvLx1oqs/Q0XVNrjkgsF6O0epUOCh3jgphDhG8UQc3DBMeqYl9zA0BHGYHJ7R+m62v27iLeOfloRMFnSrNN95uqvNIeb9LEWI9IsXv5Vnuz7QmkSW212QdNgl4ejSclBls7ywdES4lsQERN6znqYBHiWV4ArgtU4+KKGmZocuW5b8P8CoFz32eCo3STlklutUdIKCYKfktqLPseAs9yp17VchueUJXiSUBGVxsnHIoQOFsdYIEZ93Xx4dRw4ISvhie+Gcr1BWqJQaRg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3MP8-0000kD-Hp for guix-patches@gnu.org; Tue, 22 Oct 2024 17:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73955] [PATCH 2/2] services: wireguard: Support lists of gexps for most fields. Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Oct 2024 21:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73955@debbugs.gnu.org Cc: othacehe@gnu.org, Richard Sent , guix@twilken.net, maxim.cournoyer@gmail.com, eu@euandre.org Received: via spool by 73955-submit@debbugs.gnu.org id=B73955.17296323842779 (code B ref 73955); Tue, 22 Oct 2024 21:27:02 +0000 Received: (at 73955) by debbugs.gnu.org; 22 Oct 2024 21:26:24 +0000 Received: from localhost ([127.0.0.1]:57673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3MOW-0000il-8B for submit@debbugs.gnu.org; Tue, 22 Oct 2024 17:26:24 -0400 Received: from mail-108-mta188.mxroute.com ([136.175.108.188]:35351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3MOU-0000iX-FE for 73955@debbugs.gnu.org; Tue, 22 Oct 2024 17:26:23 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta188.mxroute.com (ZoneMTA) with ESMTPSA id 192b61f2db50003e01.001 for <73955@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 22 Oct 2024 21:25:49 +0000 X-Zone-Loop: 50f58fd63cf2ace2cba80cf11eece7b52a0d3be16c42 X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=lq2h9XrWM9WXMxvdRNIZU0rAGmv5q5v/5QrryLEibbA=; b=SUpNCtutuQ8JshNpu68Z23wksy YTbJjPQDjXGS8bxIC7jL1gw/iRKqJpbh0fq6YQZC7MejwcJadIWdG7fXtN0hHYz0IcAFpSr1uC+CA 3prwZaAYAXanhK6IKljwchLGoF9Q053Dq8tDsxUwAUY371thJD0UCaC8J+/+XIGFW7eclTTN2xJKS 9V3OyojLnavf91w6F9e7TjmcJ0FZNj2UOBuzngkJdjBsmjGvGsYRpPUPnZ9YRcZWNbowk78nGfN2m Un5JoLlX5IDFwgBHhLhss9mkeXdgPrErwFrs1Z/i148YDXJJXR73feI8sNUGDP21epgAeLavV8vZc tUBXsfRQ==; From: Richard Sent Date: Tue, 22 Oct 2024 17:25:29 -0400 Message-ID: <0bb043a194b4c1b7d85921aac16f2fc2cbac2cfd.1729632049.git.richard@freakingpenguin.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: richard@freakingpenguin.com 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+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-Spam-Score: 1.27 X-Spam-Score: 1.27 X-Migadu-Queue-Id: CD7118CF8B X-Migadu-Scanner: mx12.migadu.com X-TUID: bkZGKGa/aFex In order to support more flexibility in Wireguard configuration, ungexp the configuration fields directly instead of ungexp-splicing a sexp calculator. This allows for the fields to take arbitrary gexps instead of only strings which is particularly helpful for the Pre/Post Up/Down commands. For example, the wg-quick(8) manual has an example on how to use password-store to retrieve a private key with a PreUp entry. This is now possible. * gnu/services/vpn.scm (wireguard-configuration-file): Ungexp configuration lists instead of ungexp-splicing the code surrounding them. Change-Id: If074cbb78473b6fd34e0e4e990d2ed268001d6c7 --- gnu/services/vpn.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index b62e0ac838..21a7fb827a 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -797,33 +797,33 @@ (define (wireguard-configuration-file config) (define lines (list "[Interface]" - #$@(if (null? addresses) - '() - (list (format #f "Address = ~{~a~^, ~}" - addresses))) + (if (null? '#$addresses) + "" + (format #f "Address = ~{~a~^, ~}" + (list #$@addresses))) (format #f "~@[Table = ~a~]" #$table) - #$@(if (null? pre-up) - '() - (list (format #f "~{PreUp = ~a~%~}" pre-up))) + (if (null? '#$pre-up) + "" + (format #f "~{PreUp = ~a~%~}" (list #$@pre-up))) (if #$private-key (format #f "PostUp = ~a set %i private-key ~a\ ~{ peer ~a preshared-key ~a~}" #$(file-append wireguard "/bin/wg") #$private-key '#$peer-keys) "") - #$@(if (null? post-up) - '() - (list (format #f "~{PostUp = ~a~%~}" post-up))) - #$@(if (null? pre-down) - '() - (list (format #f "~{PreDown = ~a~%~}" pre-down))) - #$@(if (null? post-down) - '() - (list (format #f "~{PostDown = ~a~%~}" post-down))) + (if (null? '#$post-up) + "" + (format #f "~{PostUp = ~a~%~}" (list #$@post-up))) + (if (null? '#$pre-down) + "" + (format #f "~{PreDown = ~a~%~}" (list #$@pre-down))) + (if (null? '#$post-down) + "" + (format #f "~{PostDown = ~a~%~}" (list #$@post-down))) (format #f "~@[ListenPort = ~a~]" #$port) - #$@(if (null? dns) - '() - (list (format #f "DNS = ~{~a~^, ~}" dns))))) + (if (null? '#$dns) + "" + (format #f "DNS = ~{~a~^, ~}" (list #$@dns))))) (mkdir #$output) (chdir #$output) -- 2.46.0