diff mbox series

[bug#63561,1/2] services: rsync: Use make-inetd-constructor.

Message ID c7931b5dab466a77bc58fdf355dd53658e468ca0.1684374978.git.maxim.cournoyer@gmail.com
State New
Headers show
Series [bug#63561,1/2] services: rsync: Use make-inetd-constructor. | expand

Commit Message

Maxim Cournoyer May 18, 2023, 1:56 a.m. UTC 
* 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(-)


base-commit: 9c161c1f0def13676002ce34625ba023857b9ab2

Comments

Ludovic Courtès May 18, 2023, 4:58 p.m. UTC | #1 
Hi,

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> +                        (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

I found it fishy that the same command could be used both in inetd mode
and in “regular” daemon mode.  Turns out that rsync does something…
surprising, as noted in rsync(1):

   If standard input is a socket then rsync will assume that it is being
   run via inetd, otherwise it will detach from the current terminal and
   become a background daemon.

So I guess this is fine, and a welcome change!

Ludo’.
diff mbox series

Patch

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 <go.wigust@gmail.com>
 ;;; Copyright © 2021, 2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -221,23 +222,50 @@  (define (rsync-config-file config)
 
 (define (rsync-shepherd-service config)
   "Return a <shepherd-service> 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