From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SIrHLh+l92bv+QAAe85BDQ:P1 (envelope-from ) for ; Sat, 28 Sep 2024 06:41:36 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id SIrHLh+l92bv+QAAe85BDQ (envelope-from ) for ; Sat, 28 Sep 2024 08:41:35 +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=r+cAtB22; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=GFX4z9Qt; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=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=1727505695; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=4bES5gR/7RMnNBo4E9lUD12rSaBE4LyfNnF02VjAR5o=; b=EcllE+Mde8H+pSS43K3LgBD+pv/AUsSZccFVmjZzFx/TXJtF+PBxttUYTfDlKaLlJbX/hq WnhXQoUAXlv1AqluL/D8zlWZcYgzAKxILaP0Qb53ZsqRkUDn6FFDwL64caBza9GQeJyxAC IQ67gg9ajfWbSL9Ywl28XJzNhuOMtXEleeR673udCViQDh3vmhRfIF9yOLYSB/D2aWo2vO 9k5CZWhAMzRrAPqgfduDCsHEdlBA987/Qhcl5JdW6LfI9a5LiLX2Nm6/2t0KpzCFRfLo2p jm19KJ6yFXLahfMTTvcz6ZO2keR4bXFHiYstKyqYKvH0R6LTeFXdaEW5uaBqlA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1727505695; a=rsa-sha256; cv=none; b=pAyanWITbBBxPOV2zfR2hKOtk3XTj9qo9nvOGJLkOF7JczSrmK3j7YrLPyAifT1iuupRom lSOxLpA3hSyEiaAb36VJptKcpgd7XFtT9HcwJuvnwAqiLskKvZD14yeskoT+Uj8glj236J sEOX/0Wi2iF2o7pNZuWN95Lklwlf8AX7RtpIdCJ6mNe52Bqn3lQ2t9R2wTszOWws+sswsn zfS3yHAWB3jorth8QpGs1hFqs6ZyGtjOd5kbrjSOt58LcRs2wMlCiShEJa9rHaKm/oxlkL 5iq/O7E77B4lWLZptI7ZLoK0pJs5dvSYzXtHKERkaxEMfI5YFGrm6Tzw2QB9WA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=r+cAtB22; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=GFX4z9Qt; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=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" 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 476BF7BE48 for ; Sat, 28 Sep 2024 08:41:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suR93-0008Ft-Hs; Sat, 28 Sep 2024 02:41:33 -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 1suR92-0008Fj-IZ for guix-patches@gnu.org; Sat, 28 Sep 2024 02:41:32 -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 1suR92-00027s-92 for guix-patches@gnu.org; Sat, 28 Sep 2024 02:41:32 -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:Date:From:To:In-Reply-To:References:Subject; bh=4bES5gR/7RMnNBo4E9lUD12rSaBE4LyfNnF02VjAR5o=; b=r+cAtB22W+ibSIwmdeg4kgRQrCAxA/GoHVvmLNLt1l3OvAaUM7VLzyicpFEPZhpE2CN7Ej+GIltRAOfENoU1YDXbRatRXil41wBUHa5QEFiciAeGaD2DQpaAGV8AF49uylJ+IoiQJHhjLxDiUVBKyxcyRJNOOw/316f3ZDLQX00cX8zpyq46nFDsuMIh3CrG7rY/SRVr+E8tLWcioVg6ohfcpv+8I0TTCcTaJU3stP3AU3GDvCsFFYVyCZKVBrV83u5hL20cYMtC+1RQ+0mz79+TFXBUr6CbEW6i/jdgxkk1xjQ2UEUTUqmHJwgWhND34evkpLsnqhr43IslWlx3hA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suR9V-0005bR-Ol for guix-patches@gnu.org; Sat, 28 Sep 2024 02:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73465] Wireguard: Rename field private-key to private-key-file References: <87h6a4jsej.fsf@gmail.com> In-Reply-To: <87h6a4jsej.fsf@gmail.com> Resent-From: Apoorv Singh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Sep 2024 06:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73465 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73465@debbugs.gnu.org Received: via spool by 73465-submit@debbugs.gnu.org id=B73465.172750567221404 (code B ref 73465); Sat, 28 Sep 2024 06:42:01 +0000 Received: (at 73465) by debbugs.gnu.org; 28 Sep 2024 06:41:12 +0000 Received: from localhost ([127.0.0.1]:47747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suR8h-0005Z9-Fr for submit@debbugs.gnu.org; Sat, 28 Sep 2024 02:41:12 -0400 Received: from mail-io1-f42.google.com ([209.85.166.42]:58468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suQBL-0000wU-5q for 73465@debbugs.gnu.org; Sat, 28 Sep 2024 01:39:51 -0400 Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-8325044e388so110883939f.0 for <73465@debbugs.gnu.org>; Fri, 27 Sep 2024 22:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727501896; x=1728106696; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=4bES5gR/7RMnNBo4E9lUD12rSaBE4LyfNnF02VjAR5o=; b=GFX4z9Qt+nZuiOPPcPTUiiw5oTqNxH/vLl219VtWo2vQH7/XN3WQ+D7kot9crGbuGP y4DM4kLszuv2ZSkihQkDmoEHC9k1Bcpt9VQG85iSEKyPXizGBoE6q2JPXD89MvF+W3OI g9sCcv7/zP84/47c3zMesisPtaGmPcVsFMrp3zzyKQMC4iu2DHo5W23Sx5oC6SNQAauL sGztD1RZ9jdHohAkQWq9zUpZrEOpcgP4K0WiuPKOGEiVKKZV85mxKTHEmEF2f3lbnA4M 5yXPRfnKw2WDij6qZ4cHbjAgm2wiAo9k1IBflnKwip37hECpnNkSXyuDFcWlSkiIzWLb SPow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727501896; x=1728106696; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4bES5gR/7RMnNBo4E9lUD12rSaBE4LyfNnF02VjAR5o=; b=SXCuw8fHNmSLrs9DYCLyYCx14va/25zxeUuGppOv8lvoa+mb5pWj71F7SU/dxoj79Y ncMzwLg1du1ZRv13pKMoBOx94pg3R8em8RpQBLP1UNlzeOK2NYig+mm/DiTPuuSnZter PaEiUrEgFdErR8W99NIv87/YqCbljircoP5IdNv3MZA6rkypz/vlZsvPttF3jT+r3wHm Xh9KxIZQc+LZM4dk67ZsbT7DtTIj773quEb6OxvaIp2mveZvnG8WgjlFfZboO+q9MuJh 5NY41FDBcyFVXo22vDku+jHBLVgjhFU5uM4x5nfDXJE4rrHjAo/im0lu8NxJXUvxmxVK rP+w== X-Gm-Message-State: AOJu0YwT6AA+e5ypgxwQCCuZKJTxpxA0wVmREx3w7RulrcJgo2waHv4R X2RAdfgXNJIdoreUIs3DCA3e9AoLXsmFxQiC3iL7Tw1pPcxCK8uCLcyd X-Google-Smtp-Source: AGHT+IGDgFd3W/gG/tTsZIKziVzTQLXhLdYUD/+dahYzIAR0I2VCg8PJjJO9SKQezEjRMYPVzOZOnw== X-Received: by 2002:a17:902:d4cf:b0:201:f83e:c25c with SMTP id d9443c01a7336-20b367d01bbmr89661115ad.9.1727501370287; Fri, 27 Sep 2024 22:29:30 -0700 (PDT) Received: from MachineY.disroot.org ([139.5.251.241]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20b37e0d6a0sm20987515ad.169.2024.09.27.22.29.28 for <73465@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2024 22:29:29 -0700 (PDT) From: Apoorv Singh Date: Sat, 28 Sep 2024 10:59:26 +0530 Message-ID: <878qvcjqh5.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Mailman-Approved-At: Sat, 28 Sep 2024 02:41:10 -0400 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-Queue-Id: 476BF7BE48 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.56 X-Migadu-Spam-Score: -5.56 X-TUID: A/dnXmkM/I3E Do you want me to keep both private-key and private-key-file in the record but still use private-key for now? but just warn about deprecation for the field? Something like, ``` (define-record-type* wireguard-configuration make-wireguard-configuration wireguard-configuration? ;; other fields here.. (private-key wireguard-configuration-private-key-file ;deprecated (default "/etc/wireguard/private.key")) (private-key-file wireguard-configuration-private-key-file ;string (default "/etc/wireguard/private.key")) ``` then, in the `wireguard-configuration-file` procedure, under `match-record`, I should do something like, ``` (match-record config (wireguard interface addresses port private-key peers dns ;; keeping private-key field here.. pre-up post-up pre-down post-down table) (let* ((config-file (string-append interface ".conf")) (peer-keys (fold peers->preshared-keys (list) peers)) (peers (map peer->config peers)) (config (computed-file "wireguard-config" #~(begin (use-modules (ice-9 format) (srfi srfi-1)) (define lines (list ;; other stuff.. (when (not (string-null? #$private-key)) (warn-about-deprecation 'private-key #f #:replacement 'private-key-file)) (format #f "PostUp = ~a set %i private-key ~a\ ~{ peer ~a preshared-key ~a~}" #$(file-append wireguard "/bin/wg") #$private-key '#$peer-keys) ;; using private-key field here still.. Sorry I'm not familiar with how all this works. Just making sure before I commit any changes. Also by adjust the documentation you mean edit the doc/guix.texi:34373 file and append something like, ``` @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. 'Using private-key' is deprecated use 'private-key-file' instead. ``` -- - Apoorv Singh - Sent from Emacs.