From patchwork Sat Feb 25 18:58:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 47304 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 8D57116B42; Sat, 25 Feb 2023 18:59:20 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 75B0016AF4 for ; Sat, 25 Feb 2023 18:59:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVzlG-0001tU-9L; Sat, 25 Feb 2023 13:59:10 -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 1pVzlE-0001rw-Kl for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVzlE-0000cv-CE for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pVzlE-0007xq-6e for guix-patches@gnu.org; Sat, 25 Feb 2023 13:59:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61789] [PATCH 23/27] services: vpn: Deprecate 'openvpn-client-service' & 'openvpn-server-service' procedures. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Feb 2023 18:59:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61789 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61789@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 61789-submit@debbugs.gnu.org id=B61789.167735154630590 (code B ref 61789); Sat, 25 Feb 2023 18:59:08 +0000 Received: (at 61789) by debbugs.gnu.org; 25 Feb 2023 18:59:06 +0000 Received: from localhost ([127.0.0.1]:41477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzlC-0007x7-65 for submit@debbugs.gnu.org; Sat, 25 Feb 2023 13:59:06 -0500 Received: from smtpm7.myservices.hosting ([185.26.105.208]:59332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVzkg-0007tb-29 for 61789@debbugs.gnu.org; Sat, 25 Feb 2023 13:58:34 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm7.myservices.hosting (Postfix) with ESMTP id 4A1EF20D32 for <61789@debbugs.gnu.org>; Sat, 25 Feb 2023 19:58:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id ECBAF80079; Sat, 25 Feb 2023 19:58:25 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ho_3TATtXXGW; Sat, 25 Feb 2023 19:58:25 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id C1F4E800A5; Sat, 25 Feb 2023 19:58:24 +0100 (CET) From: Bruno Victal Date: Sat, 25 Feb 2023 18:58:09 +0000 Message-Id: <7ae425083b38612fb7bf17ab532b5774dbc70fc0.1677350250.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi (VPN Services): Replace 'openvpn-client-service' & 'openvpn-server-service' procedures with their service-type counterparts. * gnu/services/vpn.scm (openvpn-client-service, openvpn-server-service): Deprecate procedure. (openvpn-server-service-type, openvpn-client-service-type): Set default value. --- doc/guix.texi | 22 ++++++++++++---------- gnu/services/vpn.scm | 19 +++++++++++++------ 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 282c6ce276..880972d112 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31851,20 +31851,22 @@ VPN Services It provides a @emph{client} service for your machine to connect to a VPN, and a @emph{server} service for your machine to host a VPN@. +Both @code{openvpn-client-service-type} and +@code{openvpn-server-service-type} can be run simultaneously. -@deffn {Scheme Procedure} openvpn-client-service @ - [#:config (openvpn-client-configuration)] +@defvar openvpn-client-service-type +Type of the service that runs @command{openvpn}, a VPN daemon, as a client. -Return a service that runs @command{openvpn}, a VPN daemon, as a client. -@end deffn - -@deffn {Scheme Procedure} openvpn-server-service @ - [#:config (openvpn-server-configuration)] +The value for this service is a @code{} +object. +@end defvar -Return a service that runs @command{openvpn}, a VPN daemon, as a server. +@defvar openvpn-server-service-type +Type of the service that runs @command{openvpn}, a VPN daemon, as a server. -Both can be run simultaneously. -@end deffn +The value for this service is a @code{} +object. +@end defvar @c %automatically generated documentation diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 4103f89ecf..a884d71eb2 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -39,11 +39,12 @@ (define-module (gnu services vpn) #:use-module (guix records) #:use-module (guix gexp) #:use-module (guix i18n) + #:use-module (guix deprecation) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:use-module (ice-9 regex) - #:export (openvpn-client-service - openvpn-server-service + #:export (openvpn-client-service ; deprecated + openvpn-server-service ; deprecated openvpn-client-service-type openvpn-server-service-type openvpn-client-configuration @@ -531,7 +532,8 @@ (define openvpn-server-service-type (service-extension activation-service-type (const %openvpn-activation)))) (description "Run the OpenVPN server, which allows you to -@emph{host} a @acronym{VPN, virtual private network}."))) +@emph{host} a @acronym{VPN, virtual private network}.") + (default-value (openvpn-server-configuration)))) (define openvpn-client-service-type (service-type (name 'openvpn-client) @@ -544,12 +546,17 @@ (define openvpn-client-service-type (const %openvpn-activation)))) (description "Run the OpenVPN client service, which allows you to connect -to an existing @acronym{VPN, virtual private network}."))) +to an existing @acronym{VPN, virtual private network}.") + (default-value (openvpn-client-configuration)))) -(define* (openvpn-client-service #:key (config (openvpn-client-configuration))) +(define-deprecated + (openvpn-client-service #:key (config (openvpn-client-configuration))) + openvpn-client-service-type (service openvpn-client-service-type config)) -(define* (openvpn-server-service #:key (config (openvpn-server-configuration))) +(define-deprecated + (openvpn-server-service #:key (config (openvpn-server-configuration))) + openvpn-server-service-type (service openvpn-server-service-type config)) (define (generate-openvpn-server-documentation)