tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

services: rsync: Remove Shepherd 0.9.0 compatibility shim.

Browse Source 
* gnu/services/rsync.scm (rsync-shepherd-service): Remove
‘inetd-style?’.

Change-Id: Iab4a72ade621add1cf6e186c6c6a8be415829d11
This commit is contained in:
Ludovic Courtès
2025-06-06 10:23:31 +02:00
parent d2d961b76a
commit 5f3a33f659
1 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/services/rsync.scm
View File

@@ -1,6 +1,6 @@
;;; 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 © 2021, 2023, 2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -226,12 +226,6 @@ please use 'modules' instead~%")))
(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 ()
@@ -280,28 +274,21 @@ please use 'modules' instead~%")))
(requirement '(user-processes))
(documentation "Run rsync daemon.")
(actions (list (shepherd-configuration-action config-file)))
(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)))
'()))
#:service-name-stem "rsync"
#:user #$user
#:group #$group)
(make-forkexec-constructor #$rsync-command
#:pid-file #$pid-file
#:user #$user
#:group #$group)))
(stop #~(if #$inetd-style?
(make-inetd-destructor)
(make-kill-destructor))))))))
(start #~(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)))
'()))
#:service-name-stem "rsync"
#:user #$user
#:group #$group))
(stop #~(make-inetd-destructor)))))))
(define rsync-service-type
(service-type