services: rsync: Remove deprecated configuration options.

These have been deprecated since 2021.

* gnu/services/rsync.scm (warn-share-field-deprecation): Delete syntax.
(<rsync-configuration>) [use-chroot?, share-path, share-comment]
[read-only?, timeout]: Delete deprecated fields.
(rsync-configuration-modules): Delete compatibility procedure.
* doc/guix.texi (Networking Services) <rsync-configuration>: Update doc.

Change-Id: Ia7742deaf61dc87824e70172647f2974c5ddb758

2 files changed, 2 insertions, 41 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index d2e8f2335a5..dccc1fc9f76 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -24448,7 +24448,7 @@ place as when the daemon was run as @code{root}.
 @item @code{gid} (default: @code{"rsyncd"})
 Group name or group ID that will be used when accessing the module.
 
-@item @code{modules} (default: @code{%default-modules})
+@item @code{modules} (default: @code{'())})
 List of ``modules''---i.e., directories exported over rsync.  Each
 element must be a @code{rsync-module} record, as described below.
 @end table
diff --git a/gnu/services/rsync.scm b/gnu/services/rsync.scm
index c72cf9aa74b..c9de8e710c0 100644
--- a/gnu/services/rsync.scm
+++ b/gnu/services/rsync.scm
@@ -57,13 +57,6 @@
 ;;;
 ;;;; Code:
 
-(define-with-syntax-properties (warn-share-field-deprecation (value properties))
-  (unless (unspecified? value)
-    (warning (source-properties->location properties)
-             (G_ "the 'share-path' and 'share-comment' fields is deprecated, \
-please use 'modules' instead~%")))
-  value)
-
 (define-record-type* <rsync-configuration>
   rsync-configuration
   make-rsync-configuration
@@ -80,23 +73,8 @@ please use 'modules' instead~%")))
                  (default "/var/run/rsyncd/rsyncd.lock"))
   (log-file      rsync-configuration-log-file             ; string
                  (default "/var/log/rsyncd.log"))
-  (use-chroot?   rsync-configuration-use-chroot?          ; boolean
-                 (sanitize warn-share-field-deprecation)
-                 (default *unspecified*))
-  (modules       rsync-configuration-actual-modules ;list of <rsync-module>
+  (modules       rsync-configuration-modules ;list of <rsync-module>
                  (default '()))
-  (share-path    rsync-configuration-share-path           ; string
-                 (sanitize warn-share-field-deprecation)
-                 (default *unspecified*))
-  (share-comment rsync-configuration-share-comment        ; string
-                 (sanitize warn-share-field-deprecation)
-                 (default *unspecified*))
-  (read-only?    rsync-configuration-read-only?           ; boolean
-                 (sanitize warn-share-field-deprecation)
-                 (default *unspecified*))
-  (timeout       rsync-configuration-timeout              ; integer
-                 (sanitize warn-share-field-deprecation)
-                 (default *unspecified*))
   (user          rsync-configuration-user                 ; string
                  (default "root"))
   (group         rsync-configuration-group                ; string
@@ -121,23 +99,6 @@ please use 'modules' instead~%")))
   (timeout       rsync-module-timeout             ;integer
                  (default 300)))
 
-(define (rsync-configuration-modules config)
-  (match-record config <rsync-configuration>
-    (modules
-     share-path share-comment use-chroot? read-only? timeout) ;deprecated
-    (if (unspecified? share-path)
-        (rsync-configuration-actual-modules config)
-        (list (rsync-module                       ;backward compatibility
-               (name "files")
-               (file-name share-path)
-               (comment "Rsync share")
-               (chroot?
-                (if (unspecified? use-chroot?) #t use-chroot?))
-               (read-only?
-                (if (unspecified? read-only?) #f read-only?))
-               (timeout
-                (if (unspecified? timeout) 300 timeout)))))))
-
 (define (rsync-account config)
   "Return the user accounts and user groups for CONFIG."
   (let ((rsync-user (if (rsync-configuration-uid config)