From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eLZzAwqGZWQukwAASxT56A (envelope-from ) for ; Thu, 18 May 2023 03:57:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0D5NAwqGZWRH6QAAauVa8A (envelope-from ) for ; Thu, 18 May 2023 03:57:30 +0200 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 CE3F51BA0 for ; Thu, 18 May 2023 03:57:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzSt9-0004C8-Il; Wed, 17 May 2023 21:57:07 -0400 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 1pzSt4-0004Bm-IX for guix-patches@gnu.org; Wed, 17 May 2023 21:57:02 -0400 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 1pzSt4-0007Lk-8k for guix-patches@gnu.org; Wed, 17 May 2023 21:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzSt3-0000Ao-Ol for guix-patches@gnu.org; Wed, 17 May 2023 21:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63561] [PATCH 1/2] services: rsync: Use make-inetd-constructor. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 01:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63561 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63561@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1684375004634 (code B ref -1); Thu, 18 May 2023 01:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 May 2023 01:56:44 +0000 Received: from localhost ([127.0.0.1]:51543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzSsi-0000A0-RG for submit@debbugs.gnu.org; Wed, 17 May 2023 21:56:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:43272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzSsh-00009r-Fi for submit@debbugs.gnu.org; Wed, 17 May 2023 21:56:40 -0400 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 1pzSsh-0004B1-7o for guix-patches@gnu.org; Wed, 17 May 2023 21:56:39 -0400 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzSsf-0007DB-AN for guix-patches@gnu.org; Wed, 17 May 2023 21:56:39 -0400 Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-757741ca000so167221785a.2 for ; Wed, 17 May 2023 18:56:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684374996; x=1686966996; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=spwB68lZPmrnWw/mMtQAPlC3piN7aW+NpIqurj0ZnBE=; b=KYGPD6yxh45forOMddmQKysgB11HJYlaL9F7cKOKd/15uFLWpm71ETy5ByJNW/M7HQ g2lifQ9532JOQ5Z+e6+ym8YGYAPbjKLUzGLbwMbdfUHod6YTDbXQTi1uLw+lwFpW/aUz MyA6ByCbYeCnMAwo+rfInx5dXU/wUN8TPatr9uqB+JRPDhFlS44bXQ0Q93Ofl6q++SW8 7DL2qttRwJC8hx0/b0DSriC/1P11aZ/QVlo/v0WyEmBoCGNYp5B8FDxa7xiCAuiealzY vz4K+FpdNJ4ZHmd8kL8pgfKvcJvGlv2Vqv8yxnL4a1kU/jCdiqu8IL+f802obLBSG+ff olZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684374996; x=1686966996; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=spwB68lZPmrnWw/mMtQAPlC3piN7aW+NpIqurj0ZnBE=; b=eqaJQSDTUNd9JxU3p/Nzlri22RDQs7nvZFF4219UTL6GCdWS9T/IfjCdTn376jo/Ig bj4mUif0364mmWc92u90Sp/CkdcZZGliYgboXMMUkH2WBZtSFRxdNH7NSfVfJImJcrW1 8jI/PrCdYzj30ydMVjBfTvF45pbze7V1kQlKf6nOR72K4fX27XxVosJw+M4fcn9NTqF8 nPwBeHgVabKyeYy+kag5mEs2xo03ZOVAwch6QmqFC9Qqtxx0r2Owqi5u8IUcEpSQCsAU 6GQVkcY5um6J455jlo/w/hcbxli31k1tZ+/t4w2YK+tM31bCQZnN9qnnFuVXkVzt1L4K P/ew== X-Gm-Message-State: AC+VfDyfRLL2Va04tYYL4BMQwOn89GXnDFHkz+Ia+f03s5fD5xfFHpG3 haAPSB+h6rfBnhaqWQs0DoTt0HYAvyrKrA== X-Google-Smtp-Source: ACHHUZ4wlWDnbpjLfnbsmzG/UCcMfPAqpEXbRdFfG9u78ec4+ogjQutRBltTLNp0dVAIzlwyHOgpAA== X-Received: by 2002:ac8:5b0d:0:b0:3f3:9526:42fe with SMTP id m13-20020ac85b0d000000b003f3952642femr3339613qtw.28.1684374995937; Wed, 17 May 2023 18:56:35 -0700 (PDT) Received: from localhost.localdomain (dsl-150-33.b2b2c.ca. [66.158.150.33]) by smtp.gmail.com with ESMTPSA id gc11-20020a05622a59cb00b003f38b4167e5sm138672qtb.2.2023.05.17.18.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 18:56:35 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 17 May 2023 21:56:17 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::733; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x733.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684375049; a=rsa-sha256; cv=none; b=XMo2FC6eXsSFpOPChdMj46SfxSRoLbQk7cOxSfVjrZQfjLC3fWB/69vacLGYmUhrcII9P8 NB4mX38a1d0dBEPLbJzxeclim1cwM12YPyFbomfcQ7AiuLnWxC8VL3OEnAtOHUNkt45keF c2gZlE3LJAVs4gXsdQAnDX14mrRX1GZK6utDbMH5r5btsDQZomjaAKsnXLkx9/nwTN0UT9 3I0FzkPY3RB8nm6h7NOZYD1SkkveaoYP+/mrO5s5bEdzoLtJRPTtOSF4jzzmn1eASqfnkP GIiFGXOAWmt2ZsrZQF0fGa2lFSThsw6tIQx0LnrGPUbD+kxK+f5Z7sepn75HhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=KYGPD6yx; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684375049; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=spwB68lZPmrnWw/mMtQAPlC3piN7aW+NpIqurj0ZnBE=; b=LF+jfmT4N6drbGF7ttwnp6MVEXNTi1JIKIU6lXbubSFkT1cmECJMHzcr4VYI7Ro4RJ0ZTi k3PCl/llwf6JY/3Tu7GnG+tpYgdh3dJwu5Z+aJuWuy9/gpJzKWma3LImBpFFDRu9n5GOvt dgjMcVeHpyhK8IbFrscYuHtUoJYcwa8WIT9Nr7+iSntmqrNxFGVSFoe+92vbvwju1glnMg yeAVjpBFqlutJRy8y8fHlk07nUi5ThD3FxqNCiV9QDfADfMoer1+YFrZiod9XyBfvz0UeJ ZFc2tGxvTZYAs/UNRmYo3WgrVTnBbd1QDqgYQ4BXQcBBDaZffAdrKYDRZc9inQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=KYGPD6yx; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.11 X-Spam-Score: 7.11 X-Migadu-Queue-Id: CE3F51BA0 X-TUID: IWjlDDAkhiJw * gnu/services/rsync.scm (rsync-shepherd-service): Use make-inetd-constructor if available in start slot. * gnu/tests/rsync.scm (run-rsync-test): Delete "PID file" test. --- gnu/services/rsync.scm | 44 ++++++++++++++++++++++++++++++++++-------- gnu/tests/rsync.scm | 6 ------ 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/gnu/services/rsync.scm b/gnu/services/rsync.scm index aeb4275031..826b757b1c 100644 --- a/gnu/services/rsync.scm +++ b/gnu/services/rsync.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Oleg Pykhalov ;;; Copyright © 2021, 2023 Ludovic Courtès +;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -221,23 +222,50 @@ (define (rsync-config-file config) (define (rsync-shepherd-service config) "Return a for rsync with CONFIG." + + ;; XXX: Predicates copied from (gnu services ssh). + (define inetd-style? + #~(and (defined? 'make-inetd-constructor) + (not (string=? (@ (shepherd config) Version) "0.9.0")))) + + (define ipv6-support? + #~(catch 'system-error + (lambda () + (let ((sock (socket AF_INET6 SOCK_STREAM 0))) + (close-port sock) + #t)) + (const #f))) + (let* ((rsync (rsync-configuration-package config)) (pid-file (rsync-configuration-pid-file config)) (port-number (rsync-configuration-port-number config)) (user (rsync-configuration-user config)) (group (rsync-configuration-group config)) - (config-file (rsync-config-file config))) + (config-file (rsync-config-file config)) + (rsync-command #~(list (string-append #$rsync "/bin/rsync") + "--config" #$config-file "--daemon"))) (list (shepherd-service (provision '(rsync)) (documentation "Run rsync daemon.") (actions (list (shepherd-configuration-action config-file))) - (start #~(make-forkexec-constructor - (list (string-append #$rsync "/bin/rsync") - "--config" #$config-file - "--daemon") - #:pid-file #$pid-file - #:user #$user - #:group #$group)) + (start #~(if #$inetd-style? + (make-inetd-constructor + #$rsync-command + (cons (endpoint + (make-socket-address AF_INET INADDR_ANY + #$port-number)) + (if #$ipv6-support? + (list + (endpoint + (make-socket-address AF_INET6 IN6ADDR_ANY + #$port-number))) + '())) + #:user #$user + #:group #$group) + (make-forkexec-constructor #$rsync-command + #:pid-file #$pid-file + #:user #$user + #:group #$group))) (stop #~(make-kill-destructor)))))) (define rsync-service-type diff --git a/gnu/tests/rsync.scm b/gnu/tests/rsync.scm index ea53a157bb..182e5f76ff 100644 --- a/gnu/tests/rsync.scm +++ b/gnu/tests/rsync.scm @@ -70,12 +70,6 @@ (define* (run-rsync-test rsync-os #:optional (rsync-port 873)) (start-service 'rsync)) marionette)) - ;; Make sure the PID file is created. - (test-assert "PID file" - (marionette-eval - '(file-exists? "/var/run/rsyncd/rsyncd.pid") - marionette)) - (test-assert "Test file copied to share" (marionette-eval '(begin base-commit: 9c161c1f0def13676002ce34625ba023857b9ab2 -- 2.39.2