From patchwork Fri Jul 9 13:54:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 31256 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 177A727BC81; Fri, 9 Jul 2021 14:57:08 +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,MSGID_FROM_MTA_HEADER,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 9621727BC78 for ; Fri, 9 Jul 2021 14:57:07 +0100 (BST) Received: from localhost ([::1]:45294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1r06-0007tK-OE for patchwork@mira.cbaines.net; Fri, 09 Jul 2021 09:57:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1qz4-0007L9-UT for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1qz4-0006BW-M7 for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1qz4-00074M-Gh for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49258] [PATCH 1/4] gnu: Add wondershaper. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jul 2021 13:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49258@debbugs.gnu.org Cc: Aljosha Papsch Received: via spool by 49258-submit@debbugs.gnu.org id=B49258.162583891526462 (code B ref 49258); Fri, 09 Jul 2021 13:56:02 +0000 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:15 +0000 Received: from localhost ([127.0.0.1]:58794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyI-0006sD-UJ for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:15 -0400 Received: from mail-fr2deu01on2110.outbound.protection.outlook.com ([40.107.135.110]:64480 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyF-0006p1-Po for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ko9NHtEZnAJD9JN2Qi8fJT78PBkq5Ky7LyCigbEu6GIqyizJr9OSgzYOtv3fm44EdQkz425OTbiPayp3HbjpwHsv9mauBKQn8wy+srVrCVF8ESdIe4ALwXBF/uClz2V02opcG3PPrLKMV8bim0Conf7YYjQ2ZxzgxoiSZL66oz+CjLr6e7JaZuHmkVIs8wEjYmq1vyi0WipH01NSnAGPgsEXXCal2Fd/n2a6fQSWZunn0/N1WBbovwD66e75pJDuq+vL3nIfu7UFWxM8C8Vkuliyr69Gih8VwhSCww+jK/sam+hvS2K76m0CJPzQXgu5UourADC1xIOb0HhEEh9Xaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qcNafUF77Xe94PGIELysn/IebY/jb2MeTDSeYbZgwIw=; b=WObetADg2X6y7jxZ4hUXdzby2nk0K7ghDUB2QHzcm6JeQ5dxei3DQKGlvg3qJ5SGUG8O9a+13/WCOmS474cenXHDCX6katBgwlJUjUuGO7JPlJJxqGSDlJ8XnnlE1rPG1s57RAi4JM9a2UFDKXg0tl7JSJ23UKvAgA653uvh9JVqVAqS7XDmybnod054uBh4nYeYt2qTqigfjS2dWokK6ZpN/q0ewscsP7r2kLSEHr8TM2z5iZt/VDXgp2EW7hdkuajrAYDPW2xNoWwscErodzU7EuWqPQxCEPSC4QN3/dr8I3b/z/S3rSyRIU8yh3ruQ9KTCt2L+egeTpAe+gEZcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qcNafUF77Xe94PGIELysn/IebY/jb2MeTDSeYbZgwIw=; b=vEc7xgcn884kczN7mDFXKJfH8qAXsVkZXP5t6aiYE2CQKnyfw/rx0NqEV3IPcFrh7lpNxCiAxyztqUcJbwdRT+he87NSEox3NHuK3lKHNYEamingXnHHvfWgGn3UujKNu9ylcXuZ1qwsLCUuL9zUi1Kf811S5dhs3zThWsDsQ81dbWiK9KbVSJVH3Nlrui8nqSZrLOWa4zOtBXXJuAZjWQxsMw6BMk5GzTVT3JRkmcJ07SDUazXk7s6lLMYYiPsyVnFajmxYfQtNkSdRFkq1lZ1w7atyjw+JW+CF1EJ4RUcfxp9skp5dtXWtE6yVDZMaIu0k8MKQeQ82HQz3aVRxKA== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BEXP281MB0136.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.10; Fri, 9 Jul 2021 13:55:05 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%9]) with mapi id 15.20.4331.014; Fri, 9 Jul 2021 13:55:05 +0000 From: Aljosha Papsch Date: Fri, 9 Jul 2021 15:54:06 +0200 Message-Id: <20210709135409.54308-2-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210709135409.54308-1-ep@stern-data.com> References: <20210709135409.54308-1-ep@stern-data.com> X-ClientProxiedBy: AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Fri, 9 Jul 2021 13:55:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c9c5b21-4d06-4a4f-033e-08d942e127da X-MS-TrafficTypeDiagnostic: BEXP281MB0136: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:196; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SUOs8mKg/n3NtbvhDH/83HUByp78ACV5gqWlD06/4Q+5/AbBZVa5/Obo9TETijJcyaCQIt1JwoGh1+TXkFfvNwdMSryu3ENiSuEQe06spn4PNAA2NLG/58o5rF7Eq4uQesVaNAhpjhWDYzlqRvWYtPMycNT30rXm53us4ZUmjaleAji6YBRlGcOH9oGcL06XSQrau4iAt7VAOOeheYGn6Gf8AgVwDubSmpr5Z9V7bnJZjR2uRWLl7Xo7Q6zr9RTWHPMgeLjLwOm+/dD6yYHb3UP+99sGhJGm61J3cGzE8YsCjWP7djHItyp65+p7AuPSodntRIo174H4FYPnAX0tRzJ768InTAJha4KF4/YT+RIlGLXlzVkgvZ6ch/BJSXpdsVNSc0xPyKbrHqWVIq41YHeG1kPz+twuhD6Z9hZPntDKfweQ8bf/7GH6Vj8KIwG0VSGZtN3uAzAyYAcMIKL3RUgOTxJPoEQ8z8LiFbWakNfU0pR5pML4jb1fk14+YhJVTSQiX/vnAugEbruyMD+odLI/WDkp4ufNoaDe+qoUSLzVyU0YTtRwJ2UNWUlPAjgfS2Nz6GaaSG5TA/pfMpqwlBBD9Fl0FSLy5J4rfLDq/dRfaD2G/uGcin5RsOwZyBZXPG4TYq1dp4tpOowwu63MiMGya31kluFfD2bTElZHigdnoYppcgKDraRQkDOXcG5xG9qzKLravjG2/iCTs7w+HprC4oH69r+p3q4CXtkV7N8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(346002)(136003)(376002)(39830400003)(6916009)(66574015)(52116002)(66946007)(83380400001)(186003)(5660300002)(6486002)(66476007)(6506007)(2906002)(107886003)(2616005)(478600001)(38100700002)(6512007)(4326008)(66556008)(36756003)(316002)(8936002)(8676002)(86362001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: REjbzmUdlJxLgbnJwZ5Lg8kgN849mOP6EPPGpnzL+4W22ffJovbZvDAyZ51OgVNmoRM7UcTOvwonBYx+pVAy12WhiyasfnnDo1cfjtOb10F+LBIlF81rs9XWfALcF5uxBy5Aq9oav79RMd6rZl7NaLAdWJVuHPvus24AbYGL/Lb+u6RBFTAqZnaXe3iPg2WjGZ5i/kxNz0J2IvsMDxgOmZAV2s+Xgnp5BuIoIrDtg4X/M7aWzl2X6wbMYQRrDp07uxORoyTKw7JMlFtrDM2PV3YxzBMgaflX95IpPPOxHI/bMVj8osZQbRuK037e6zfYltacx01odeo+qGBV8jnxBpe2lLS3bRd7aXx4rc7k4fS2HmIoSS4HmjrCjU5/Fpg7qBDyAJjLUdhpzqugdeZfVIiajrfx7ol5N0PHyVE27keQsDIWuRJe6mIUYQYNwxmE2sn3Ckep+f6MOdijrJbr47sNRpMwdlH3dGUBhQtsbOTj0TLdaBQ4/Qy2r3LJSibhMKDNpIeKVzNi24h90OShV4FGnwhV2aTCEWYhm1PrFk+a1Hh+UldyAYLZ6bubK8rPseUrR+LLyGIcBshihVElBvcoxLkAq+cdb2g1tAwCrX1PA60qSNoN9DR2WoT/9COQWH3qCg9DcemS1dt02wzo2x6nXqehUIYSdnRa04EtDHGylngZo788DE4XV56MfVANNRZzDnEO2zsXSSxM5kH0AJq1J8r0x6oOlvALLcN0umglL6EqSOfPtpDcJJ7VLHlAQvd8Y4w/ByjewjrTJIWZpUWw8jKiACErbgnLfbP+mWrH8i1lUDo9akQ8jMhIUmKBXOqVhmUvFNWpgYP/jWJzizEUUniW/OJN9ausYgrRk5y5p8hGnz+QjkxN313gSXUT9a5CrEh8BsvwvBMwXUGFBbIMSggiC1TJHiLPOjTeJv5fN7Wttxc4UBJ8BziQtzK17ARM+9H58x8Wbi6miQQKUmT2toPJUu5Ti7o4RnKmiT6Adjr2/bey6FjC8sNd675umpa3yev3+UKQd7zdK+I3OpOPOp0ZFIJP7FF6Fof3SD9NZ2kd/vNhrV3BgC9Dk9gDbX3OWyHieQ0rr7xxpcEXV5eWQXCkD/ZPN0+Bl1VBxcJtXB9XJq+fykGU7E+eG3yt5ynmaGgoPvOUFS6Myiwz+4HKxX7bo4h5LVBc6CWIwU1w6rY8bmrAUel06DtH/ftOfByS8LaIfaG1N9O5zdIuz57IfUvtHRNRqfpHgDe8onvAtBBR8kCtbZbOC1dlg4JY/6lDDR3IjrhKU1mPLJD6OiPqWHT1yzEuL6y8OcB7cEAP0wnnfS7IbFPkp9eZJaBl6mQTHHE+d/xig7/1klhzjGq3/5OV0bBMj+mm/z8aUevlgc93xGfnxl+byEdVcmPJ X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c9c5b21-4d06-4a4f-033e-08d942e127da X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2021 13:55:05.4504 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7/XON/MErEAchXPKmKJHxadpcwoj4VC5N8f29x2UkArmsrciaF+w6gffn5NEGlWd7cF3RgY8YlXID8sxEgVjhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEXP281MB0136 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (wondershaper): New variable. --- gnu/packages/networking.scm | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fe73c9cdc7..920d01d8e5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -64,6 +64,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -4069,3 +4070,53 @@ IPv6 Internet connectivity - it also works over IPv4.") ;; version. This exception does not (and cannot) modify any license terms ;; which apply to the Application, with which you must still comply license:lgpl3))) + +(define-public wondershaper + (package + (name "wondershaper") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri + ;; Use a fork that allows overriding the configuration file + (git-reference + (url "https://github.com/apapsch/wondershaper") + (commit "0987dbb0c360184b8aacf391646e19ea9ee78b10"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hyivkpvr5pv8wg64i7vgpxib4allbp4v1ahp3qhc1d88rkw7gjs")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("./wondershaper" "./bin/") + ("./wondershaper.conf" "./etc/")) + #:phases + (modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-invoked-commands + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/bin/wondershaper") + (("^\\s*ip ") + (string-append (assoc-ref inputs "iproute2") "/sbin/ip ")) + (("^\\s*modprobe ") + (string-append (assoc-ref inputs "kmod") "/bin/modprobe ")) + (("^\\s*tc ") + (string-append (assoc-ref inputs "iproute2") "/sbin/tc ")) + (("^\\s*cat ") + (string-append (assoc-ref inputs "coreutils") "/bin/cat ")) + (("/etc/.+/wondershaper.conf") + (string-append out "/etc/wondershaper.conf")))) + #t))))) + (inputs + `(("coreutils" ,coreutils) + ("iproute2" ,iproute) + ("kmod" ,kmod))) + (synopsis "Command-line utility for limiting an adapter's bandwidth") + (description "Wonder Shaper allows the user to limit the bandwidth of one +or more network adapters. It does so by using iproute's tc command, but +greatly simplifies its operation. Wonder Shaper was first released by Bert +Hubert in 2002. A subsequent release added a command-line interface. Wonder +Shaper makes use of tc's Hierarchical Token Bucket (HTB) queue, ensuring good +bandwidth management on high speed (above ten megabits) links.") + (home-page "https://github.com/magnific0/wondershaper") + (license license:gpl2))) From patchwork Fri Jul 9 13:54:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 31257 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 D017C27BC81; Fri, 9 Jul 2021 14:57:29 +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,MSGID_FROM_MTA_HEADER,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 47C3727BC78 for ; Fri, 9 Jul 2021 14:57:29 +0100 (BST) Received: from localhost ([::1]:45702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1r0S-0008BZ-Dr for patchwork@mira.cbaines.net; Fri, 09 Jul 2021 09:57:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1qz5-0007Lk-4k for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1qz4-0006Bf-Tt for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1qz4-00074U-Tu for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49258] [PATCH 2/4] gnu: Add wondershaper service. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jul 2021 13:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49258@debbugs.gnu.org Cc: Aljosha Papsch Received: via spool by 49258-submit@debbugs.gnu.org id=B49258.162583891726534 (code B ref 49258); Fri, 09 Jul 2021 13:56:02 +0000 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:17 +0000 Received: from localhost ([127.0.0.1]:58844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyK-0006tH-Pa for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:17 -0400 Received: from mail-fr2deu01on2110.outbound.protection.outlook.com ([40.107.135.110]:64480 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyH-0006p1-Ll for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oPirDiWvX0F3iqrCsv5JQCJ05vSyps/QQh07k19FxECiH1xRRVOpSjSjXHZsjl/xQfdzHhp/NSo9uOaxE1a79TNQ3XRRWe4B9yxsXpuQuEc8WA2t3RHskHrdU4bMpOww1n2rfOT5zMkvCo484AlxFPLoBYUiiz3ltj706WX4hrj7q/piY3fDc6rkybPrmvDyHYr7HW15XkUUH6KDDeXXrl6SeSVsXupng4/Mgm1Qp1N1vKk964ZoYc6ucoFsjAPHlOrU06BCDmQz2UZ8NLiVhIwl1g9u7DRFEr2DYV9749jYzpR1ADChRC44miqzB6G817d8dnS56p2XvqMzl74AtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qTJPmNlv5H6W/nLdyWF3iBZdq+X3P0nvtqnjah1Eq9s=; b=N0dkiv1KGc4taGrChy+CVBvfJ2LwxsC7EgEgE8sNsiTqC9Wwiu+qikNf2bX78M26kxbwmXZ0Bv66mz4M3BsarEwGabFAOBunn91d1kLyq1dFmALu5J3xLuzwDLaLUHqWuTLQtACOCz4EcxLS0MDKDxrNsX6HiyCpc5cUshkb+JKGRkE+UduIZ3jxd7EycE/4NTW7XWEuwtAwQfvBsJzlF1vbSUFb3koQKNhruPR7l0ZaM7M606zIKNNH2nBRTT/6UzG2uOqYx2JE+8o7M5HtqT5sAnMRXnbiJNcToJQMRTp5AqCwxj8h77/NZOubba44+ibpULUNzIZNN0KdEZUQnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qTJPmNlv5H6W/nLdyWF3iBZdq+X3P0nvtqnjah1Eq9s=; b=tSIJ6uDANRcJZIAHMkAEAPkA1/iNVjU2KWyqeqWpS6Ukk/QC9J/oJ8sKw3bMI2I/YebvMGx5XFY73LSQeydLb4iB+cbMKZG11gFLCfE6WjRAIhngQJVpukJ1EvrKH2+T1PwsL5s6jaVl+XpGkC8KWUojop681hYm6hU5INOvYZX5/p0B+E+ydQe41JSspOJ+LsM/newAwPaw4dupRecdmxdTkastFZvPGytYIkpOczo1FiW/lPVI4Ws6kMP+SYMf0ajKyqUNnr63jIU7mOA9WEnoGtLYifwRxIKgdnqQqpPot/jOMT01fU8IcZPVvsTSJhSzYAPdnJ3r3xVTn3ce/w== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BEXP281MB0136.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.10; Fri, 9 Jul 2021 13:55:05 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%9]) with mapi id 15.20.4331.014; Fri, 9 Jul 2021 13:55:05 +0000 From: Aljosha Papsch Date: Fri, 9 Jul 2021 15:54:07 +0200 Message-Id: <20210709135409.54308-3-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210709135409.54308-1-ep@stern-data.com> References: <20210709135409.54308-1-ep@stern-data.com> X-ClientProxiedBy: AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Fri, 9 Jul 2021 13:55:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b981ff73-63b6-42de-de85-08d942e12815 X-MS-TrafficTypeDiagnostic: BEXP281MB0136: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OSPXQcPmxDZta2CW3k3bLaYX2qU0U7Asc2c/SHDJcttDUU0KGjHaQA3ZNW5Y9V0UwX6wG550N8aAbWn1qpzTEh18brtUhKFC4/ueI8EszQ0nPftwYYzQFT/r3BDU5Rn+6jdZxDcidBz+ilBzhTVJQdKn7tNMAu30V84UxUsXxevN/uFIjNM86n0Itkxf25Vqne8TqFkCc2wEugvVCZtWG5DbofSuAOYnMlcKOHAhX4OnpcaBxPeOzuITyZGKGwJ0R3ojvvRscNHH5J+96ESRsu3QG9CPDa3CKYlCTo1udiWOyEwP6zbtRi4hN8t2lyFq808wszI7G/QNb2tA1AjUV2z1w2JJcPF67T/VCmom42cD8/s1kgF0rGydVA6RJDxVj1pRNPs+wSREOK8ONOrMQaruVUduhgbBJRcmRPXRJNf9Zv7Sm9k6GLAvX2YM9mUZir38z2ZtvevjMNx/OYrMlbxYs7m4zlXfylCc5t4/sSrHqAaKR0dDjGC+YtbQBgmwt6sb/bxajs/mQIbdaoyJeeKr0j+nJSdXZ3ic3fb3feHKugiCvFI4GTVFyURKw37u1Xd1dHicg5uNGVdIbB6SioaEK15kRi0Gdz8amlU1Ed05eDk5TTvqiQ/fx6vlFPnrsKIlitSzof99WWyS8Zh4agFhoDXH7uDiCYs3qa/j/fcXJqKG6ts+I1tBqlXvk31tQoF6rjPCrxM2x6UM5Yqa9qQPSOccFdRFBACChWzpUHU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(346002)(136003)(376002)(39830400003)(6916009)(52116002)(66946007)(83380400001)(186003)(5660300002)(6486002)(66476007)(6506007)(2906002)(107886003)(2616005)(478600001)(38100700002)(6512007)(4326008)(66556008)(36756003)(316002)(8936002)(8676002)(86362001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YYzPgWTEUJLUnF7DF+M2Tz1aChXjnVJpRFTXcz0kkUnDzBC83s6g77d8Ib3frKvi3ig2rYJLLzxczfPAiV4sUi/LZhsNm+a/tWylz9tdJSRDZTCXh56VxHSkJOrJN4ElZofMIZAVXSflUIRpXWrPxsrJmdjwFOHCVtgEkhr3zHOAwEQrtMkPs9A+LUGtlK7KJF3XO9aevLRGty3lyx21hK4b0mU9lTBCjSerD+558c3MaA+/cMOt/O3d3uIZgXCrpMI3uiYdM9Ckhmf8W81YRc3tUQMfR9eshW0T6KbHpFFLbeVhW9sftdBBdNCLoAcpOG+lr9V/HsIGgvwMVLAffd5bTw8GeR2Kru3lit+0np1ek11YNbxXinT7F0FL6vLoq+NcunRPGfL7eXDEL0eRu7zoFG0IRbzcwSzgtJnc8IgRwSfHv3u/kK5Daj6Rs65mCw6TyAgHUjMEwcq9c8O9kDGK+ozRUt6/thcP7N/2VBT8gVXhZouRdwlpYHO2gTuYhyS50kiizrmttR29vJHi49zCEM2H/MFa3HllBtFk/Adj1ZK0ue+VwCKi2OAeK+NdHo7ycLaZesoryVbqDurcR3It2NY04iptKhLqtH3aMmn7oWk3Xnrssrwic3Qikn6Eund5x7k0bTspwXLQp14RehhxJxHPn+F2F2dR2I1aiCjh6yM1jxwQJfQcYRZxB1sUBHY04r8qLekv/sL8vc+IVE2+17YheYzOtK+x3FdFYsMK7Y8JCrDoIMNOAsvZnvEjhY+4P4go4HtIm25pX4dd9ybaCeuYGb/kHQEIHfd7YAmGnCmJg3xfMqW23V5Jko36pCrf2V71dO91bOofzooSclQw5JTJ6nqfwdoV1jTWwMd96+y6X/bSZpD9ZzrWxL7kptGBXaeld8OlOWEKAskx46algK/51GIi+gA9D2T/risRCKyRSUlLmOgY4e1lXf5y5h+din+X7nF/ICSfphDrkPNkNWmA5B/LIV4meb8DgAeQcttAK50b24iORuM3c01AiCjEkbORYQG6HvFGAgMzAiJG4UAocijWw8OX83GVfyuRvgyUrv2muHPpAQ2MN5/xbpVj1S82VprrszSjDUjI2TOuNqLqzDmW8QyQGPTNVBnXX6YOY+L5p3+ul5+Zod3zBfLP2rlhRFuVm1hvGK2uln/CHWRmFKKp6/5iCmn0ABK+SXkItmMUvVLZucy3epCV1fvMlJ0NfhqPPb0UMXIvy7Y61Rf7trPngO0ojNQLdFxv/x7727lxiS8uMafxRX1q1kGx5WxkSAFnJUG6JCE67njRBbtrS5l4gCM54wG+wlOZjmH9Jt3B8daVuJyBJW+ysbU/vHRAUtFu/0cGhGf+IreBp6HoGejCE+t4oBwymJKh0p+fJyVF2BNgNG33Q2W0 X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: b981ff73-63b6-42de-de85-08d942e12815 X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2021 13:55:05.8367 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pUKGxLIOR+9S5mUhL2Xxp1IQFZBxFWcS7b0ZHFEVzBtNOa0FhBHTl+IT2kNsEOXl2z1TnHB3JHQ8K2UvX3JPFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEXP281MB0136 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" X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (wondershaper-configuration): New symbol. Configuration for wondershaper-service-type. * gnu/services/networking.scm (wondershaper-configuration?): New symbol. Predicate for wondershaper-configuration. * gnu/services/networking.scm (wondershaper-service-type): New symbol. One-shot service running wondershaper with a generated config file. --- gnu/services/networking.scm | 107 +++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 1ae58041d3..1d3e061758 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -218,7 +218,11 @@ keepalived-configuration keepalived-configuration? - keepalived-service-type)) + keepalived-service-type + + wondershaper-configuration + wondershaper-configuration? + wondershaper-service-type)) ;;; Commentary: ;;; @@ -2151,4 +2155,105 @@ of the IPFS peer-to-peer storage network."))) "Run @uref{https://www.keepalived.org/, Keepalived} routing software."))) + +;;; +;;; Wondershaper +;;; + +(define %wondershaper-default-download-speed 2048) + +(define-record-type* + wondershaper-configuration make-wondershaper-configuration + wondershaper-configuration? + (wondershaper wondershaper-configuration-wondershaper ; + (default wondershaper)) + (interface wondershaper-configuration-interface ;string + (default "eth0")) + (download-speed wondershaper-configuration-download-speed ;number (kbps) + (default %wondershaper-default-download-speed)) + (upload-speed wondershaper-configuration-upload-speed ;number (kbps) + (default 512)) + (prio-3-rate wondershaper-configuration-prio-3-rate ;number (kbps) + (default (/ (* 20 %wondershaper-default-download-speed) 100))) + (prio-3-ceil wondershaper-configuration-prio-3-ceil + (default (/ (* 90 %wondershaper-default-download-speed) 100))) + (high-prio-dest wondershaper-configuration-high-prio-dest ;list of ip addresses + (default '())) + (no-prio-host-src wondershaper-configuration-no-prio-host-src ;list of ip addresses + (default '())) + (no-prio-host-dest wondershaper-configuration-no-prio-host-dest ;list of ip addresses + (default '())) + (no-prio-port-src wondershaper-configuration-no-prio-port-src ;list of port numbers + (default '())) + (no-prio-port-dest wondershaper-configuration-no-prio-port-dest ;list of port numbers + (default '()))) + +(define wondershaper-config-file + (match-lambda + (($ _ interface download-speed + upload-speed prio-3-rate prio-3-ceil high-prio-dest + no-prio-host-src no-prio-host-dest + no-prio-port-src no-prio-port-dest) + (begin + (define (shell-quote str) + "Return STR wrapped in single quotes, with every single quote in the string escaped." + (let ((quote-char (lambda (chr) + (if (eq? chr #\') + "'\\''" + (string chr))))) + (string-append + "'" + (let loop ((chars (string->list str)) + (result "")) + (match chars + (() result) + ((head tail ...) + (loop tail + (string-append result + (quote-char head)))))) + "'"))) + (define (list->bash-array lst) + (string-append "(" (string-join (map shell-quote lst)) ")")) + (define (format-config) + (string-append + "IFACE=" (shell-quote interface) " +DSPEED=\"" (number->string download-speed) "\" +USPEED=\"" (number->string upload-speed) "\" +PRIO_3_RATE=\"" (number->string prio-3-rate) "\" +PRIO_3_CEIL=\"" (number->string prio-3-ceil) "\" +HIPRIODST=" (list->bash-array high-prio-dest) " +NOPRIOHOSTSRC=" (list->bash-array no-prio-host-src) " +NOPRIOHOSTDST=" (list->bash-array no-prio-host-dest) " +NOPRIOPORTSRC=" (list->bash-array (map number->string no-prio-port-src)) " +NOPRIOPORTDST=" (list->bash-array (map number->string no-prio-port-dest)) " +")) + (computed-file + "wondershaper.conf" + #~(call-with-output-file #$output + (lambda (port) + (display "# Generated by wondershaper-service\n" port) + (display #$(format-config) port)))))))) + +(define (wondershaper-shepherd-service config) + (match config + (($ wondershaper) + (list (shepherd-service + (provision '(wondershaper)) + (documentation "Configure traffic control") + (requirement '(networking)) + (start #~(lambda _ + (invoke #$(file-append wondershaper "/bin/wondershaper") + "-p" "-f" #$(wondershaper-config-file config)))) + (one-shot? #t)))))) + +(define wondershaper-service-type + (service-type + (name 'wondershaper) + (extensions + (list (service-extension shepherd-root-service-type + wondershaper-shepherd-service))) + (default-value (wondershaper-configuration)) + (description "Run @uref{https://github.com/magnific0/wondershaper, +wondershaper}, a small utility script setting up traffic control (tc)."))) + ;;; networking.scm ends here From patchwork Fri Jul 9 13:54:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 31254 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 EFDE227BC81; Fri, 9 Jul 2021 14:56:36 +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,MSGID_FROM_MTA_HEADER,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 7230827BC78 for ; Fri, 9 Jul 2021 14:56:36 +0100 (BST) Received: from localhost ([::1]:44698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1qzY-0007Qv-3r for patchwork@mira.cbaines.net; Fri, 09 Jul 2021 09:56:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1qz5-0007NT-Ug for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1qz5-0006Bo-Mq for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1qz5-00074b-AQ for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49258] [PATCH 3/4] guix.texi: Document wondershaper-service-type. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jul 2021 13:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49258@debbugs.gnu.org Cc: Aljosha Papsch Received: via spool by 49258-submit@debbugs.gnu.org id=B49258.162583891826554 (code B ref 49258); Fri, 09 Jul 2021 13:56:03 +0000 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:18 +0000 Received: from localhost ([127.0.0.1]:58884 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyL-0006tv-9X for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:17 -0400 Received: from mail-fr2deu01on2110.outbound.protection.outlook.com ([40.107.135.110]:64480 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyI-0006p1-F7 for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j46yboZUz8ivufYYe7i9De61iv/arijB/oBJHPyf44y9omCR19TefcL9mU5UmF61OsYIfgGjof42xOu/1wVCdSKEanxqUPuUdvCF+5U68kxPo1MKb/r0ddpCdZbUfYihQeg4njUGiyS2YxsnsflDzwPI3Ct/sz9XXDt+b3uJvNSwY6C/o4zJKtHScU/Z5aLfWrN+MeLNeNZPJ5FBPDysyFPBhMkkHJHdv79CEoeOSJsx5nQia36GeAHodjGYCs6ZcBdT4pCEuYAotmuyHHRvUOoYqNs6hWabDPALnVabORoMMe2jmhm/euRLmDs+6UnoKvxx2FDGSJ7dVZ8rZ9c8DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zK93GCIZkJdPvQmrshYdRdYpmjR0CnArto943FwzqWA=; b=JyZa6ACpwcLTkohjO9r7sWNzN+UfEwEr93y5U3VzmVIkL6aj3/OBtBVCuOxb2psKRsNrwPHVN2mGwE6ceTIFt8q903dJrKzYKJkm2aWYrdSXlFxs87KSC7gk1NE5pTBFTL166hW3i/7GBiPA4wy4pqdAG9odxsNC4Z1ZqBDFs/SzSaVRJp1SnzZZqex/fnwbxgYxYlQdoL7o1pXtbRpCjrk0UlbbrAG9rTrh/V4s/sIT9iPwM4joaX+W1/S9zwxdesE5USzpUsUW/e2Imy10YBOlIriLLgrwojIy5kH338lZNc9LYGepXa/ljlO8U+PQNeWOJL1DYzjD/nmihG0gZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zK93GCIZkJdPvQmrshYdRdYpmjR0CnArto943FwzqWA=; b=mOp626fA4N2KZMBw4CagoKWkiSNze3+54DlhqJr3+d/PQHaq7UkjI4lyB5Ng1pAybg4FiKg7FmBPjZ/OtiOlAZmP3qsGrM/Psg5qZUPlCAsvhV+ZV1aUAcJ2bIVoPQ3D3z2gBnOXJY/JfvrdjC1pkfP/Da8F0845gALW3hbNHd1CkHJZEPmHbr7NXDdq/03LaQPN0wBrxCX+UkMTWvQIjLYbU3YBXmYTMqb8X+FtpRnNUR12V7cqPO6Qao79Fy6LJsPWFgQThILTM56YUs6NTs2FYCpEm6eu1zZR9rOnx2hAvWSxypeUByqjPARX9D4l+nGlLLiXDp6OBLS1ku40Mw== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BEXP281MB0136.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:6::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.10; Fri, 9 Jul 2021 13:55:06 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%9]) with mapi id 15.20.4331.014; Fri, 9 Jul 2021 13:55:06 +0000 From: Aljosha Papsch Date: Fri, 9 Jul 2021 15:54:08 +0200 Message-Id: <20210709135409.54308-4-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210709135409.54308-1-ep@stern-data.com> References: <20210709135409.54308-1-ep@stern-data.com> X-ClientProxiedBy: AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Fri, 9 Jul 2021 13:55:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1b3ac1f-a75e-4e23-146d-08d942e1284e X-MS-TrafficTypeDiagnostic: BEXP281MB0136: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1rEyR93M3hZ+bhBtKtd3VgKcbmTTFVerQf2Ed1i+lhKGUdAHFZL3b4/WBRtlMhBXr7VK9+M99yIg1S7+skKYDz2JCVVqaHN6z3qI4EpGMJf0aNEwZOAQpwhEfSrdGsTW2nQ+bO0TdO1TcZUOdu3W9IkA5gRRf7YMgXM+hX762bTv6UweH9f4vtEFcUPcp2PBKPEDoMxkPmyiwOjPXvA9bvqHl6qk+1d8jUtxq9yqnZ/cnYSrOTB94YLbAxlvt7Uy1kP2IxD58Vwt8aXzwebBVDiUDQIzxu4NMsiFW1d3fimqjjGHw6mQoZUQ48s3fIiv33Pfqa1BrEtKrjzLWUNR+i8N+2Noy6+Vk8Na89G06co5uJfbwgdqI8aM8iYMrmNxZ3lZfOSSCJl1T36pimgg+ecjsIwd7tBM49fp57wsWWq0uWBkWw7n525119K4tc2IxAh5eMgDNT3urdn2mJ11MIb5TAnDVCh6ASuYCTwwiUTw9Yq/QfjzDGmY9AkdYv5dGsypvENJ/Vx96jNLtCgx9FfkK25HROI5cfAeUrmLvwyTaQRSjjh/IQZp3v9AMgcwYeMHIVrDSLiOZG3V9uPk+3N0uJ+Uy9jphsmakO3Y9RyWNGoddG9pKjUGHx1vwPSHypOt0bXZBcpt/I7TlbCOODuk/x9+X/gUsvfiMdMW9FhQtvvvbSDuR4tWqZMhHSzypO2A+7sM5Yt2IAsazqQ3dJUPCvJ1lxiBfgcvsZlEfv4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(396003)(346002)(136003)(376002)(39830400003)(6916009)(52116002)(66946007)(83380400001)(186003)(5660300002)(6486002)(66476007)(6506007)(2906002)(107886003)(2616005)(478600001)(38100700002)(6512007)(4326008)(66556008)(36756003)(316002)(8936002)(8676002)(86362001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JJ9jcUmzWpVEc8Q03LrUkK/k77+ExhP9bPwJS3bd9+ABKTuUoMO3Rxb5f0OPuyjphKdSN9OL4ZAyx2kiO5iX2+ceNHUG2PTwoKEg4lX4Bp6iblWK6Ukr74Tuh7VtzQmbP2RmKhJi4Gz2tptEgQszFbR/aqPvsAp9f0ViwAqjmpUBxhgWsqKpkzHsgwyYgpGLhO4zfUj/W4//al9oRC63GJqJA5x0mVFqdcW0OnMFjSiM8tle3OuCdXdttc2voDXm+WrNozxbQGBb88QOpD5ochlWt16PvEj2lX9XlZ+OXuDUOy4uMOBA1D+f/yhy7JvJRExyyx3z1d+oMHnlIdaA4thwbRy59bQpE7KgE0RWhKoyRPs5vKQJmpwDc+u0ats7ooHA+wpUdhwB12xDwuPQLkRdtJBkP4Spdihz0EAFNXFe7oWTJtrmmRsQkc1k0BABpn9qnthFKOzQODzFFesaJm+eIJYQBbPytuxPVYdSxBBmkYOUG7snEGdKMOAW49rBPjVkZhl3snandkOYgxz9IJRDKF/T3tq7lJL6IZ88Nhj7W3IPgpxscKB/uhUzQVxZPLWMSIb3QaMufSZaRCBUXrRmaXf3GSIeqom5e49bWVlEvJtJNxMOsObw4RecGWxxehbOG2RHLUHYz2L0vcI2q2ErHANvKDKUlJg4r06UciIN2c44XnJ/ygnQrmKPLi9McX5+kY/BdfRs7HfV95Dcuk9i7X429u51LkhUZ0571q2VviIu2vTU5yUk5DPW8+MqMDxovG7wOUJmvKxiv7Xsut1qGWuEgH+UDDCSHbrf7v2J2NAaGLafs2oOMvmwr2F3CgY6bpTPkKd+SVZDgFwP2FmeKwgjAeMMr/KuGN/iR5B6Hgb61fArcZPIHlKQ7xckVORAJXkESEYgOLvglcx9+F5xZspoBu+Vx7HkXS1OKgC13O3PF39jA8GiJMYNnG8+GdFSZPZToGNG6+8Ec3TlnJfcoigb82hgC+CwjGk20hQ+7LbkwYgM0LkvsY44BtCrWz2cy6NNyneipVrF/I05bMl4Y1Tnk6h7vkS2kpuHTuYdjX+Y3f6A5UVoMa+9RYx7gGQZ0CGsrinLVosXWeZ9w2CJiPKQyHr/dDj2kycsqQKAOVuQIzotuABkwoT/9BFgFvpdwx4RxNb6ktEkRSXdeI9KQ4yVbG9qhuFYyZ1Zotvqwa1QyWyzkglmkHbeyZBPNk7rZeqlRFDC479l3tOG0tFSpJXSlnBUYwdN7NAuZkGeq4cVLHhdd+acmPXkNwAYNFuafJETU8EFNQK0lOHQWkN1+yNvbBY9b4mnG9JaaUSJtWYfCblK/hbhfh0VOZrOOrllBTDKXePTh4Vd5vDRg7/2yJyNr1SjRl3yvH2N52N1mcRtV1R2iyhpRM63LGED X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1b3ac1f-a75e-4e23-146d-08d942e1284e X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2021 13:55:06.2081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: n3Mdh3Q43gECxpoCJ5ZXI0YhRHPam1z/74Hqv3J7dkxqRteLAoLtwr0f2vgxOD47vclotXFOmSX3TqqeqLpV3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEXP281MB0136 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" X-getmail-retrieved-from-mailbox: Patches * doc/guix.texi: Document wondershaper-service-type and wondershaper-configuration fields. --- doc/guix.texi | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 18bc600440..58238f5935 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -16945,6 +16945,79 @@ See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information. @end deffn +@cindex Wondershaper +@defvr {Scheme Variable} wondershaper-service-type +This is the type for a service that runs +@uref{https://github.com/magnific0/wondershaper, Wonder Shaper} once +during boot. It configures traffic control (tc) with a Hierarchy Token +Bucket (htb) queue both for upload and download. For upload three +classes are added in order to prioritize traffic. Priority 1 is the +highest priority and priority 3 is the lowest priority. Interactive +traffic (e.g. ssh) is designated priority 1, while non-interactive +traffic is designated priority 2. Priority 3 is reserved for specially +configured ports and addresses. The service is configured using a +@code{} record. Some options below are not +found in the original upstream release but are maintained +@uref{https://github.com/apapsch/wondershaper, in a fork} until merged. +These options are marked specially. + +@end defvr + +@deftp {Data Type} wondershaper-configuration +@table @asis +@item @code{wondershaper} (default: @code{wondershaper}) +The package that provides Wonder Shaper. This package is expected to +provide the script at @file{bin/wondershaper} relative to its output +directory. The default package is +@uref{https://github.com/apapsch/wondershaper, a fork of Wonder Shaper} +adding more configuration options. + +@item @code{interface} (default: @code{"eth0"}) +The interface for which the limits shall be applied. + +@item @code{download-speed} (default: @code{2048}) +Maximum download speed in kbits. Tune this parameter to be a bit less than +your actual download speed. + +@item @code{upload-speed} (default: @code{512}) +Maximum upload speed in kbits. Tune this parameter to be a bit less than +your actual upload speed. + +@item @code{prio-3-rate} (default: @code{download-speed * 20 / 100}) +Maximum rate (kbits) for the priority 3 class, which is the lowest priority for +upload traffic. In a desktop environment the default computed value +should suffice, while in a controlled environment you might want to set +a static value. This option exists only in the fork! + +@item @code{prio-3-ceil} (default: @code{download-speed * 90 / 100}) +Maximum burst rate (kbits) for the priority 3 class. The same remarks as +for @code{prio-3-rate} apply. This option exists only in the fork! + +@item @code{high-prio-dest} (default: @code{'()}) +List of destination IP addresses for which traffic is designated +priority 1. This applies to upload only. Note that SSH (not SCP), ICMP +and packets smaller than 64b are automatically designated priority 1 no +matter the destination address. + +@item @code{no-prio-host-src} (default: @code{'()}) +List of source IP addresses for which traffic is designated priority 3. +This applies to upload only. + +@item @code{no-prio-host-dest} (default: @code{'()}) +List of destination IP addresses for which traffic is designated +priority 3. This applies to upload only. + +@item @code{no-prio-port-src} (default: @code{'()}) +List of source port numbers for which traffic is designated priority 3. +This applies to upload only. + +@item @code{no-prio-port-dest} (default: @code{'()}) +List of destination port numbers for which traffic is designated +priority 3. This applies to upload only. + +@end table +@end deftp + The @code{(gnu services rsync)} module provides the following services: You might want an rsync daemon if you have files that you want available From patchwork Fri Jul 9 13:54:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aljosha Papsch X-Patchwork-Id: 31255 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 67E5227BC81; Fri, 9 Jul 2021 14:57:02 +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,MSGID_FROM_MTA_HEADER,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 C187927BC78 for ; Fri, 9 Jul 2021 14:57:01 +0100 (BST) Received: from localhost ([::1]:45176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1r00-0007oi-T9 for patchwork@mira.cbaines.net; Fri, 09 Jul 2021 09:57:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1qz6-0007OF-EH for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1qz6-0006C9-3S for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m1qz6-00074j-3z for guix-patches@gnu.org; Fri, 09 Jul 2021 09:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49258] [PATCH 4/4] Add wondershaper related copright lines. Resent-From: Aljosha Papsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jul 2021 13:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49258@debbugs.gnu.org Cc: Aljosha Papsch Received: via spool by 49258-submit@debbugs.gnu.org id=B49258.162583892526993 (code B ref 49258); Fri, 09 Jul 2021 13:56:04 +0000 Received: (at 49258) by debbugs.gnu.org; 9 Jul 2021 13:55:25 +0000 Received: from localhost ([127.0.0.1]:58898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyL-0006uF-TU for submit@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:25 -0400 Received: from mail-fr2deu01on2107.outbound.protection.outlook.com ([40.107.135.107]:61280 helo=DEU01-FR2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m1qyI-0006p8-1r for 49258@debbugs.gnu.org; Fri, 09 Jul 2021 09:55:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dS6PkYzR1O7O2pVP2seIr84Gw9L9Q82xXANLtruEZz7A/4OK2UZUMrKKRNUFBmXCVz5ZTdcXljLKuPnOzFVe9SlktEIAtRSWwMKnweJBEetxHPOx5iWqVgLznq4lcrRNf9m4V5s75OmXWWKLOzAu5YyVitmCmTjAJOMiOnLCWaqnbOJuSmypY6J4fsiVRhaj+SAafnYzoI6ypedINH1n+LUF00jpsiE3SJzBU6OTLKV3Z+/urqVYFn9YI9/SoMg+acymMVCxB1wH+9xkPQDLKkD5d/DTIQVZUmJNaf5iv19JT4SJNcvFUe/a8E9yN13oIwVy1lczHZorPdi8LICeRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SVttmT2gMSNyTuIH70WGxcA+Pp8yQtcQnBIKrd/sONE=; b=W4cVxw7Vm6KlTwRo3Bz3INeV044J9q+Fv3J+EvZ8LoBdLUjmVibNHg3EODpak4oapD79X5b8QB0cOmsEbbAWYphaFUM9d2G35oUIlYIaY/8VcJxsp9avfOoh/a27GyhRlF5QsY4VosOEZUuG0TYh+4qCQPFXodPT7r02stF8NeYtl25xOOcUMuEeGlpV3VgGOWsm/+coKEdYN4+jqFCM1QcoliqWoFKWcxZo64aHG7jDmrrCOWJylXZw8hqgtrwDeLOTXMCuCnc4Vrr6TN8Ec8nI0H9WsNx7RTuqvur9F9gA4rPKr72+J6Dt4zm9Hkp35TBsMAjjJsMHBbsIC76CyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=stern-data.com; dmarc=pass action=none header.from=stern-data.com; dkim=pass header.d=stern-data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sternasset.onmicrosoft.com; s=selector1-sternasset-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SVttmT2gMSNyTuIH70WGxcA+Pp8yQtcQnBIKrd/sONE=; b=0TWRZKfT4fkrKc/VDOpTqqElAymMg/Kduyt864AIVfRWwk62epsCFvIGOjk7sFApBw+5SBQS86ViB++Ff6JiERhwhAPFj5buSEYzRZa3SgWT5mbClxz6bouJg3Jms4vhh1yZ9/HxwOnaIO5r2SyPo+/j/9CRGkR2q+VvFmWNFgSTLBoFe9jUOZ6pflumXLkYYBudP+VQblNZKN93fqyTNqkY+vVb0NVhNNlrEZ/3NuiJ0lnaAwFe0ytm439aog9Dxu7xNz9zNHjHjLGdJD1RsVoool0toUnlrb9F2AyFrkEdde0wCfuvLHTb5Hn5xrJtRyxpgRBUXYftCz4dzgAmww== Authentication-Results: debbugs.gnu.org; dkim=none (message not signed) header.d=none;debbugs.gnu.org; dmarc=none action=none header.from=stern-data.com; Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) by BE0P281MB0257.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.11; Fri, 9 Jul 2021 13:55:06 +0000 Received: from BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72]) by BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM ([fe80::b9ef:9f1:8c7c:cb72%9]) with mapi id 15.20.4331.014; Fri, 9 Jul 2021 13:55:06 +0000 From: Aljosha Papsch Date: Fri, 9 Jul 2021 15:54:09 +0200 Message-Id: <20210709135409.54308-5-ep@stern-data.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210709135409.54308-1-ep@stern-data.com> References: <20210709135409.54308-1-ep@stern-data.com> X-ClientProxiedBy: AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) To BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:f::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:908:c39:9d60:ec9b:bd9a:f3b7:625d) by AM3PR05CA0113.eurprd05.prod.outlook.com (2603:10a6:207:2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Fri, 9 Jul 2021 13:55:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89721b65-3a2a-44ca-2a4a-08d942e12890 X-MS-TrafficTypeDiagnostic: BE0P281MB0257: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yy837GqnYan4UwcV/1dwXa1piOT0yux7TYTcDP77ib/oz/jB3HdvqWjGt7vKuTu3fcUSZ1hx8GVSPXXcSAlPeNZ0m00W391Vh7stsVWosR4HCtaO7FbLzOQFlZtmoaXWZcpW9s4OWQl3w/H8OjStneM6MjvLsnXF2w3t3QJr/b0IedeJsm8qfQhtO8VTbX7sft6rIZvpZ09u71Sp4XCpBk/I8mIG5gyCIV6JcJ6yjAO+oVyY77ix/wlGCbeiM68BxZzzp1XPdGJc3i7p7Fsob+MmOJyODQ5gEpub8u45W620q2aS3efk8k5qhmeK96lbUrKctdYhytp6ZVARS6f4z06i48FP1Qhwvvw894Ewy5i64vafe45fEN/gG4F9Bl7gs7ipidwOb8H/hvLeAduMkTZNjJn2Cvtk01XvAxTICEbQNDN5TXb8MpPf5Sv/nL6o7Ieyr7mG//5F4rahq6y/Cdrv1PHvnR9105T9McDQjFw1uSbBqofj95evc1++6yZRqgx24RWH2UXe1o0S5gDLBPONydgUUC21Qy61zy+u3en1w5fxtTAtpJxJ+iSV/kVIcuSfB2bFcM/C224qp6Q4QBdw+bGMxQ5Cm4UCURkRGl/wUGQtTa8kHFAAgCvhIO3yk9an/5DXb+/ZF1yRhWUekHVc2vRH/iWpqpgyMhKlIG4PYW07del3b+WysBd3If6auGVsyWw78sn4n99k66qR/Vv2O+WlEBglvIOZTb16/qQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(376002)(396003)(39830400003)(136003)(5660300002)(36756003)(2616005)(6506007)(1076003)(316002)(186003)(52116002)(6916009)(478600001)(66556008)(86362001)(66476007)(66946007)(8676002)(107886003)(83380400001)(8936002)(6512007)(6486002)(38100700002)(4326008)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4VL7s8pnncki1VTSVMxaBXrexFbSn9yLETy87MmCTc+VPgfblf97dLtU3cutXeptQIxyTbVAvrTwZHpKd251FhhnOssW2CbgG9hdWT5fx2vSMrJ9Q1OmlEPL56O+mVvhEiFlI1+E6h59hNas4FsbdCX8dYwhR4iNmANLEjafXZsV/3WltwDraNh54uCtTTc/nnj6tywTbklQeKKSjxd1m5FtwUXYKS8r35POj2eVoC53ZA2eNQFt/iUbfTBpn/8tPStaipRrI1mfAm2IkDXJ2e+6VuvR5sNpzhx0clJFyUDCxZLsb0g4r7sXcjUpu4ha+kS82RiioH981xalMwMuGDZ+N4peN3ORW0xeYlWWOt7+bVJw6LhZnXD88pMYZc3LN/LLJ+YSRSl3Gt4JqPTfQnDpqLUGJK5U4JlCGfeNH0ZF/SbeSnZPI2gHtPT4zTBVT9crhlj7YQxy3dW4sAeWABJnWnMHBg+YVGe3j6hx+aB9l5gk/tIZvY9x17p3iylZ/o4t/VfzMITHxWrYx64/Qnra17yxIpU89Rlw1pqmXsY64W0MVW8c2TKu0i49OYz8IhCBVI+PDDohl0KvpauT0ZwroX1kNAkOe6kxuhLFm5Fm5HW2cgTiMUSNVC7XsllwmQeqsUT1IUk8S38C76pFsNiFgVqp+uzaSpWHhJkEzKSrwUgmZx15apwwZDSXG7u+Ic6AeETm8QH7HTSU+0tLcwQPNroVMLtHMsv3h7Thh5HflcelirEcVnePQqBZelJbMQeSQpL5BlDf2PRwPoI5na9BHwq4Znu3+AOxOCLWGK9hXyQHsTbWKFAWs2gKKwOpr0VrG/m1gyki9w9eTGkF4v/AmWvda9sJhmq6d+A6UZyz4D1B2KJTebLUDN0SolULWeWSg+VMo3aBxqZblwe7QzH6TECQRvJGh2rdQJrcK9IScCaOCuwzIQWnnFGGaISmLOIbbpGwGkz4IfcXRQhsbcEnCCvYLrOGIEaykgjp5DSEKKsKeKKi2q0bkPucs8VzUHEHt7NKyJuudL/XGqYAD8aVrR1wPcLOxi6JTQ4vf1Z32Y6QRJ6BvYvOTm/D3YpUNbOdVwIg5JhUIpUABpGYKUNIOGeP8jwS3Gs6E47vTmn7V3zq0RbO5Jgwt4ymj5oqmT3wgdB/BIXgo1pXxdVa0E+8LMwCKKIn3LKs5HxqWQQcXTkGjIfNHyUbGjgKDd5hPi9wox4+0CtDe5gB+1nMonQJyd43oronDiPCdRMWRl5Mip29k6jrsNy4cbJuUglu1aSJmfCxvhsJEufvf1C0ORVerw9SijonoyujbKdBWsY010b6Oc6wfgCqst8DyRwa8V24tn6SQ0UASYCPIVGLXN3FCJSMkVEXsQmY7JuijKLFY16xaVls+lYdIzvaBb9A X-OriginatorOrg: stern-data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89721b65-3a2a-44ca-2a4a-08d942e12890 X-MS-Exchange-CrossTenant-AuthSource: BE0P281MB0034.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2021 13:55:06.6880 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e55b1d7b-b6d7-445f-a720-8de54d4464ac X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Qyvcqm1Dmc/Pvi7SOSIsUBZor2ZRc1Xw2jmow84UOlyMgPWtM6h5fk8cVho71T8Lu56WgZXkQK1CBM/vMb/N3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BE0P281MB0257 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" X-getmail-retrieved-from-mailbox: Patches --- doc/guix.texi | 8 ++++++-- gnu/packages/networking.scm | 1 + gnu/services/networking.scm | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 58238f5935..b07c7d7ebe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -91,7 +91,7 @@ Copyright @copyright{} 2020 Edgar Vincent@* Copyright @copyright{} 2021 Maxime Devos@* Copyright @copyright{} 2021 B. Wilson@* Copyright @copyright{} 2021 Xinglu Chen@* -Copyright @copyright{} 2021 Raghav Gururajan@* +Copyright @copyright{} 2021 Aljosha Papsch@* Copyright @copyright{} 2021 Domagoj Stolfa@* Copyright @copyright{} 2021 Hui Lu@* @@ -864,6 +864,7 @@ version 0.1.0 or later; @item @uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi}; @item @uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.5.0 + or later; @item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON} 4.3.0 or later; @@ -3740,6 +3741,7 @@ other substitute server. @cindex ACL (access control list), for substitutes To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER-1}}, @code{@value{SUBSTITUTE-SERVER-2}} or a mirror, you must add the relevant public key to the access control list (ACL) of archive + imports, using the @command{guix archive} command (@pxref{Invoking guix archive}). Doing so implies that you trust the substitute server to not be compromised and to serve genuine substitutes. @@ -18817,6 +18819,7 @@ Specifies whether to support HTTP keep-alive connections. Defaults to @samp{#t}. @end deftypevr + @deftypevr {@code{cups-configuration} parameter} non-negative-integer limit-request-body Specifies the maximum size of print files, IPP requests, and HTML form data. A limit of 0 disables the limit check. @@ -27233,6 +27236,7 @@ Defaults to @samp{#f}. @end deftypevr + @c %end of automatic openvpn-server documentation @subheading strongSwan @@ -35513,4 +35517,4 @@ providing artwork and themes, making suggestions, and more---thank you! @c Local Variables: @c ispell-local-dictionary: "american"; -@c End: +@c End: \ No newline at end of file diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 920d01d8e5..4feffcd2c7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Hamzeh Nasajpour ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Hartmut Goebel +;;; Copyright © 2021 Aljosha Papsch ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 1d3e061758..4fb9c788d4 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Oleg Pykhalov ;;; Copyright © 2021 Christopher Lemmer Webber ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Aljosha Papsch ;;; ;;; This file is part of GNU Guix. ;;;