From patchwork Sat Jul 3 06:05:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 31072 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 D88CE27BC83; Sat, 3 Jul 2021 07:07:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0904827BC78 for ; Sat, 3 Jul 2021 07:07:33 +0100 (BST) Received: from localhost ([::1]:44614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzYoO-00077I-3l for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 02:07:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzYn6-0004U1-BD for guix-patches@gnu.org; Sat, 03 Jul 2021 02:06:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzYn5-0005J4-P5 for guix-patches@gnu.org; Sat, 03 Jul 2021 02:06:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzYn5-0000Bp-Ku for guix-patches@gnu.org; Sat, 03 Jul 2021 02:06:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48729] [PATCH v8 25/25] services: Add bitmask-service-type. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 06:06:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 48729@debbugs.gnu.org Cc: Raghav Gururajan , jgart Received: via spool by 48729-submit@debbugs.gnu.org id=B48729.1625292370715 (code B ref 48729); Sat, 03 Jul 2021 06:06:11 +0000 Received: (at 48729) by debbugs.gnu.org; 3 Jul 2021 06:06:10 +0000 Received: from localhost ([127.0.0.1]:37775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzYn4-0000BF-5P for submit@debbugs.gnu.org; Sat, 03 Jul 2021 02:06:10 -0400 Received: from out1.migadu.com ([91.121.223.63]:45166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzYmu-00008G-0a for 48729@debbugs.gnu.org; Sat, 03 Jul 2021 02:06:00 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1625292359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xjiP326vUZiC9f2xjSz77iCPKZmZK4iGX7kNl6yvy2I=; b=bdM0Li/gTXDjbVIFzzmxfrsBu9KPdCp2aIqx7/YQWZZWVehjK1dVBbjAB2hcSxWj1JB37N cJBJxxvd/Hv9zHIk80Oz1UyvqvoThqnTCt8jAwmrX3UpqG8cxoMuVsKTWqdVeJx+q61Kd4 8fMV66PMhgFoWfcvNTjTGsB+epMYRKYvepH7kV7rqci/THtTjOUsugEPycQS3X396oqCk7 pY1pqO4RvMtxyEI7DF1zmaG1w5EIAw8cLQogC/5WTKhMsuEMPl+JRVG9VWtcMItAykMvzl 8mNvddgVAta8kEfME8FOvw+wLkxsb8DATUtPBH+swqwsDv0BP4zN6rqsvd3vHA== Date: Sat, 3 Jul 2021 02:05:23 -0400 Message-Id: <20210703060523.8220-25-rg@raghavgururajan.name> In-Reply-To: <20210703060523.8220-1-rg@raghavgururajan.name> References: <20210703060523.8220-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches * gnu/services/vpn.scm (bitmask-service-type): New variable. * doc/guix.texi: Document it. Co-authored-by: jgart --- doc/guix.texi | 7 +++++++ gnu/services/vpn.scm | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 8681645021..d06ad1635c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26769,6 +26769,13 @@ Defaults to @samp{()}. The @code{(gnu services vpn)} module provides services related to @dfn{virtual private networks} (VPNs). +@subsubheading Bitmask + +@defvr {Scheme Variable} bitmask-service-type +A service type for the @uref{https://bitmask.net, Bitmask} VPN application. +It makes the application ready for use. +@end defvr + @subsubheading OpenVPN It provides a @emph{client} service for your machine to connect to a diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index a51dda3873..df84905eb3 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -6,6 +6,8 @@ ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021 Domagoj Stolfa ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Raghav Gururajan +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +27,7 @@ (define-module (gnu services vpn) #:use-module (gnu services) #:use-module (gnu services configuration) + #:use-module (gnu services dbus) #:use-module (gnu services shepherd) #:use-module (gnu system shadow) #:use-module (gnu packages admin) @@ -69,6 +72,22 @@ wireguard-service-type)) +;;; +;;; Bitmask. +;;; + +(define-public bitmask-service-type + (service-type + (name 'bitmask) + (description "Setup the @uref{https://bitmask.net, Bitmask} VPN application.") + (default-value bitmask) + (extensions + (list + ;; Add bitmask to the system profile. + (service-extension profile-service-type list) + ;; Configure polkit policy of bitmask. + (service-extension polkit-service-type list))))) + ;;; ;;; OpenVPN. ;;;