From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uKEuCUmtJF8BVAAA0tVLHw (envelope-from ) for ; Fri, 31 Jul 2020 23:46:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oKvIBEmtJF8FIwAAbx9fmQ (envelope-from ) for ; Fri, 31 Jul 2020 23:46:17 +0000 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 B376A9403D2 for ; Fri, 31 Jul 2020 23:46:14 +0000 (UTC) Received: from localhost ([::1]:46564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1ej5-000134-WC for larch@yhetil.org; Fri, 31 Jul 2020 19:46:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1eiw-00012w-E7 for bug-guix@gnu.org; Fri, 31 Jul 2020 19:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1eiw-0003L0-2p for bug-guix@gnu.org; Fri, 31 Jul 2020 19:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k1eiv-0002BU-Vt for bug-guix@gnu.org; Fri, 31 Jul 2020 19:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#42544: [PATCH]: gnu: services: Make some openvpn options optional to include in the openvpn config file. References: <029ee37c6910a0136916fd1673a517bd@selfhosted.xyz> In-Reply-To: <029ee37c6910a0136916fd1673a517bd@selfhosted.xyz> Resent-From: david larsson Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 31 Jul 2020 23:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42544 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15962391128334 (code B ref -1); Fri, 31 Jul 2020 23:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jul 2020 23:45:12 +0000 Received: from localhost ([127.0.0.1]:38815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1ei7-0002AM-MN for submit@debbugs.gnu.org; Fri, 31 Jul 2020 19:45:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:49018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1ei4-0002AD-US for submit@debbugs.gnu.org; Fri, 31 Jul 2020 19:45:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1ei4-0000ui-9u for guix-patches@gnu.org; Fri, 31 Jul 2020 19:45:08 -0400 Received: from server0.selfhosted.xyz ([217.64.149.7]:39294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1ei2-00035U-2V for guix-patches@gnu.org; Fri, 31 Jul 2020 19:45:08 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=selfhosted.xyz; s=dkim; t=1596239096; bh=7noIXKRg3U+PKIa/RegbMU4FolBGgF8hIrlxd6ljU30=; h=Date:From:To:Subject; b=lj3b/3ZwAxtzE1DXoDPHr28jY65y2qp1uHpfwKREtYqofe2CvHwU66UkENQrFl/wh CjHXh7vRAajEtf68DgWv1CFHj769IcroCihwIbUY/AOPc/HPlYF5DySaa9UYE6g6S1 urLV42F60eHVKdWTB/TlXrRtQMLhexT3jrU5JE/n4Ma0FU1qVlFHP65SQXKysjH4Ws IZRpEVIGDLagDjabpKa+RHKIKrwkzpellJNB1XcMxjP/yx0bqyufbCpOzg6wr5fMHV Kbl4/7bsec51XMw5o5qWb29AosWtjy6Xk2vTDT2uth/40m0LAdbC36m6f03k1aeZhe 2Bnv6JNqWdESw== X-Fuglu-Suspect: 92602d32d5ed4892b824583f3542c473 X-Fuglu-Spamstatus: NO Received: from [127.0.0.1] (localhost [127.0.0.1]) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Date: Fri, 31 Jul 2020 23:44:51 +0000 From: david larsson Message-ID: X-Sender: david.larsson@selfhosted.xyz Received-SPF: pass client-ip=217.64.149.7; envelope-from=david.larsson@selfhosted.xyz; helo=server0.selfhosted.xyz X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/31 19:44:57 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 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, FROM_SUSPICIOUS_NTLD=1, FROM_SUSPICIOUS_NTLD_FP=1, PDS_OTHER_BAD_TLD=1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, URIBL_BLOCKED=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.1 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.9 (-) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=selfhosted.xyz header.s=dkim header.b=lj3b/3Zw; dmarc=fail reason="SPF not aligned (relaxed)" header.from=selfhosted.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: 72hQGkPaj5Wb From 5014aa2f455b127deaa013f327dc1cc42d0e1772 Mon Sep 17 00:00:00 2001 From: David Larsson Date: Sat, 1 Aug 2020 00:16:02 +0200 Subject: [bug#42544] [PATCH]: gnu: services: Make some openvpn options optional to include in the openvpn config file. * gnu/services/vpn.scm (openvpn-client-configuration) (openvpn-server-configuration): Change cert and key options to type maybe-string. --- gnu/services/vpn.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 658d5c3e88..6155fd7938 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2020 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -277,12 +278,12 @@ servers.") "The certificate authority to check connections against.") (cert - (string "/etc/openvpn/client.crt") + (maybe-string 'disabled) "The certificate of the machine the daemon is running on. It should be signed by the authority given in @code{ca}.") (key - (string "/etc/openvpn/client.key") + (maybe-string 'disabled) "The key of the machine the daemon is running on. It must be the key whose certificate is @code{cert}.") -- 2.18.0