From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KRJMGRV0UGGQXAAAgWs5BA (envelope-from ) for ; Sun, 26 Sep 2021 15:22:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4O13FBV0UGFoeAAAB5/wlQ (envelope-from ) for ; Sun, 26 Sep 2021 13:22:29 +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 09D5A2CF17 for ; Sun, 26 Sep 2021 15:22:29 +0200 (CEST) Received: from localhost ([::1]:40136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUU6u-0006QC-0X for larch@yhetil.org; Sun, 26 Sep 2021 09:22:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUKYE-0002cg-Dz for guix-patches@gnu.org; Sat, 25 Sep 2021 23:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51989) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUKYE-0002mh-5v for guix-patches@gnu.org; Sat, 25 Sep 2021 23:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUKYE-0007u9-1E for guix-patches@gnu.org; Sat, 25 Sep 2021 23:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50808] [PATCH] services: rsync: support binding rsync to a specific IP address Resent-From: Jacob Adams Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Sep 2021 03:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 50808@debbugs.gnu.org Cc: Jacob Adams X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163262574730297 (code B ref -1); Sun, 26 Sep 2021 03:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Sep 2021 03:09:07 +0000 Received: from localhost ([127.0.0.1]:35302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUKXL-0007sb-AD for submit@debbugs.gnu.org; Sat, 25 Sep 2021 23:09:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:54802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUKUZ-0007mO-1O for submit@debbugs.gnu.org; Sat, 25 Sep 2021 23:06:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUKUY-0000hy-Sm for guix-patches@gnu.org; Sat, 25 Sep 2021 23:06:14 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:43373) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUKUX-0000Ey-EE for guix-patches@gnu.org; Sat, 25 Sep 2021 23:06:14 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id EC7445C00D8; Sat, 25 Sep 2021 23:06:12 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 25 Sep 2021 23:06:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tookmund.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=qPSbcMjjEpSBi zEKakLfoaC5Ftce8Vp0bTOG6YPNDqA=; b=kAnwtKDvqFPlqF2FwsXrE0RaVRaRC aMfzklebNzmS3gHjWMTyaZOTOmlFIK3Grvhzr9dX4lqo61nZ/QHh2oH5+GF6PwT6 /kDCEK5jWy0wDtBUQe4kiwAgIL4LjUkRd4a4Mujj6+xQBZK332o7tMZFoh/DUVz2 PRtinQLyj9lNK4tjdi2G1l1f9Ac7cj8h+vzWqqR4S70gCLvpeBxo0qzHPXoIa1+q wfDHPKx2lh7WSF5ApS7BAXportSoQtGT2DfpUEhXpsCybOoKKHPA728V8UfAsAlO aoQOodJ+pLSXbs/BDuwTlYt8TCp/cUPezAt+xtbQ7hkQWLaNynsthTZWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=qPSbcMjjEpSBizEKakLfoaC5Ftce8Vp0bTOG6YPNDqA=; b=ovJzH3/u Rg6RaxuOhBYYEuYudDeNLEfvvU9HR6VUj8NNqasQY2zkIk4psDMkimA/Nyel3wdK TW/o8yPgoSrwKkM/RiUDplayUiqVC68oXqocRZtG+UoM8fsC7WoakZhkx5D6FA5F WLdvHpprL0Iuv5hM9LrF62+eUHpdiea+UFiKVmwIa65xiWuhQINjWIMStiEEDA9a 9/x/Pac4vk0wo+3d1rRMLw//GsxSZgC4nuZKe4XvPBld5ZltHKajZMC95d/0HQNn cxEUKGujAr3r8Xiy84F5smr9+mYKioI3SxJKQsd50wqOkCGvR/QuhIJxcN6ILBBG ClwSNYbtgZHyhQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrudejgedgieeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheplfgrtghosgcutegurghmshcuoehjrggtohgssehtohhokhhm uhhnugdrtghomheqnecuggftrfgrthhtvghrnheptddvtdejgfdtleejueekfedvuefhud fghfegleffgfevieeufefhvdejuedtuedvnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepjhgrtghosgesthhoohhkmhhunhgurdgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 25 Sep 2021 23:06:12 -0400 (EDT) From: Jacob Adams Date: Sat, 25 Sep 2021 23:05:11 -0400 Message-Id: <20210926030511.17476-2-jacob@tookmund.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210926030511.17476-1-jacob@tookmund.com> References: <20210926030511.17476-1-jacob@tookmund.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.25; envelope-from=jacob@tookmund.com; helo=out1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 25 Sep 2021 23:09:06 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 26 Sep 2021 09:22:16 -0400 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632662549; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=qPSbcMjjEpSBizEKakLfoaC5Ftce8Vp0bTOG6YPNDqA=; b=bI0ehsffkoyQVV+rcl3GG1DmyzZ3eXpBMFGS8cK3yFD+n/Wl8hocOv9rX0i0aUcK0raPfh q3aKDTOA2UMZjfE3NRNGjpQLUAZzV33AWeRN11DSj/VG0+9nv93CXZ7YkZLd9i53gUD5oq rTnW7AR9iDnryI6BvLsTUMoRJOVphXmD0q0C6SXvWfLThNYwmwtA26JRt4ddgvH0z/FcmU BC1RKF+jsbGxzIi/kmOl2vEltWxA3B4kd4HVUy4ts+VGpveDjforsHkvouLQLie/cz7wOh +6tGBi/a2QKBqbbB8CGSgCOq/0acsly3aFrV57Ron+ZNbD94Vtm96aUY/qxWkw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632662549; a=rsa-sha256; cv=none; b=Lakv1yq1oo5JBJPiEiUG3GXcw4GHhwWCrcu8b8mQm8jL2tg0grGM9LUsNldFX4vbjJflGV AjxS/UgPTOyLLVLOBRHdYMZM2P2goktTyG635eNKQg0T2WyhaYspNyy8YlYC1HWJAULqtv V82V3XPiFBIO92Z1IeoJt6UPKQp8Xji8tLmQXkYiah1svMMAyM/ru0kHtmTgp4kkAPcYx9 YNtcIjjWTbeslx9ym9AT3j4wWDEnEuMDDi8qcXYeAK4GkhFfwnpsULCOdDZapJbh61KpcP VxRKXVBQfuLWLIALPPFQvxTdlkgBVohTqccqrMPXxTnJMcuXfk8jViWUtjTo5Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tookmund.com header.s=fm1 header.b=kAnwtKDv; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="ovJzH3/u"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 5.11 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tookmund.com header.s=fm1 header.b=kAnwtKDv; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b="ovJzH3/u"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 09D5A2CF17 X-Spam-Score: 5.11 X-Migadu-Scanner: scn0.migadu.com X-TUID: LShcz2jq7J6D * gnu/services/rsync.scm: Support IP address configuration * doc/guix.texi: Document new address rsync configuration option --- doc/guix.texi | 4 ++++ gnu/services/rsync.scm | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 4bf14014eb..9a858de2d9 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -17151,6 +17151,10 @@ Data type representing the configuration for @code{rsync-service}. @item @code{package} (default: @var{rsync}) @code{rsync} package to use. +@item @code{address} (default: @code{""}) +IP address on which @command{rsync} listens for incoming connections. +If unspecified, it defaults to listening on all available addresses. + @item @code{port-number} (default: @code{873}) TCP port on which @command{rsync} listens for incoming connections. If port is less than @code{1024} @command{rsync} needs to be started as the diff --git a/gnu/services/rsync.scm b/gnu/services/rsync.scm index 6c117bbda4..0a9ed82a42 100644 --- a/gnu/services/rsync.scm +++ b/gnu/services/rsync.scm @@ -45,6 +45,8 @@ rsync-configuration? (package rsync-configuration-package ; package (default rsync)) + (address rsync-configuration-address ; string + (default "")) (port-number rsync-configuration-port-number ; integer (default 873)) (pid-file rsync-configuration-pid-file ; string @@ -110,7 +112,7 @@ (define rsync-config-file ;; Return the rsync configuration file corresponding to CONFIG. (match-lambda - (($ package port-number pid-file lock-file log-file + (($ package address port-number pid-file lock-file log-file use-chroot? share-path share-comment read-only? timeout user group uid gid) (if (not (string=? user "root")) @@ -132,6 +134,7 @@ "pid file = " pid-file "\n" "lock file = " lock-file "\n" "log file = " log-file "\n" + (if (not (string=? address "")) (string-append "address = " address "\n") "") "port = " (number->string port-number) "\n" "use chroot = " (if use-chroot? "true" "false") "\n" (if uid (string-append "uid = " uid "\n") "") -- 2.30.2