Remove rsyncd and require smeserver-rsyncd [SME: 12252]

contriborbase

@@ -1 +1 @@
-contribs10
+contribs11

createlinks

@@ -68,17 +68,12 @@ $event = 'group-modify';
 templates2events("/etc/httpd/conf/httpd.conf", $event);
 safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 safe_touch("root/etc/e-smith/templates/etc/smb.conf/shares/template-begin");
-safe_touch("root/var/service/rsyncd/down");
-service_link_enhanced("rsyncd", "S95", "7");
-service_link_enhanced("rsyncd", "K05", "6");
-service_link_enhanced("rsyncd", "K05", "0");
-safe_symlink("../daemontools", 'root/etc/rc.d/init.d/supervise/rsyncd');
 safe_symlink("/var/service/rsyncd", 'root/service/rsyncd');
 templates2events("/etc/rsyncd.conf", "bootstrap-console-save");
 templates2events("/etc/rsyncd.conf", "remoteaccess-update");
 
 # for php-fpm
-foreach my $service (qw(php-fpm php55-php-fpm php56-php-fpm php70-php-fpm php71-php-fpm php72-php-fpm php73-php-fpm php74-php-fpm php80-php-fpm php81-php-fpm)) {
+foreach my $service (qw(php-fpm php72-php-fpm php73-php-fpm php74-php-fpm php80-php-fpm php81-php-fpm php82-php-fpm php83-php-fpm php84-php-fpm)) {
     foreach my $event (qw(share-create share-modify share-modify-server share-delete smeserver-shared-update)) {
         safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/$service");
     }
@@ -86,15 +81,14 @@ foreach my $service (qw(php-fpm php55-php-fpm php56-php-fpm php70-php-fpm php71-
 
 foreach my $file (qw(
     /etc/php-fpm.d/shares.conf
-    /opt/remi/php55/root/etc/php-fpm.d/shares.conf
-    /opt/remi/php56/root/etc/php-fpm.d/shares.conf
-    /etc/opt/remi/php70/php-fpm.d/shares.conf
-    /etc/opt/remi/php71/php-fpm.d/shares.conf
     /etc/opt/remi/php72/php-fpm.d/shares.conf
     /etc/opt/remi/php73/php-fpm.d/shares.conf
     /etc/opt/remi/php74/php-fpm.d/shares.conf
     /etc/opt/remi/php80/php-fpm.d/shares.conf
     /etc/opt/remi/php81/php-fpm.d/shares.conf
+    /etc/opt/remi/php82/php-fpm.d/shares.conf
+    /etc/opt/remi/php83/php-fpm.d/shares.conf
+    /etc/opt/remi/php84/php-fpm.d/shares.conf
 )) {
     templates2events($file, qw(webapps-update bootstrap-console-save share-create share-modify share-modify-server share-delete smeserver-shared-update smeserver-php-update));
     safe_symlink('/etc/e-smith/templates-default/template-begin-ini', "root/etc/e-smith/templates$file/template-begin");

root/etc/e-smith/db/configuration/defaults/rsyncd/TCPPort

@@ -1 +0,0 @@
-873

root/etc/e-smith/db/configuration/defaults/rsyncd/access

@@ -1 +0,0 @@
-private

root/etc/e-smith/db/configuration/defaults/rsyncd/status

@@ -1 +0,0 @@
-enabled

root/etc/e-smith/db/configuration/defaults/rsyncd/type

@@ -1 +0,0 @@
-service

root/etc/e-smith/templates/etc/rsyncd.conf/10global

@@ -1 +0,0 @@
-port = {$rsyncd{'TCPPort'} || '873'}

root/var/service/rsyncd/log/run

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-exec                                    \
-    /usr/local/bin/setuidgid smelog     \
-    /usr/local/bin/multilog t s5000000  \
-    /var/log/rsyncd

root/var/service/rsyncd/run

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-exec 2>&1
-
-exec /usr/bin/rsync --daemon --no-detach

smeserver-shared-folders.spec

@@ -6,7 +6,7 @@ Summary: sme server shared folders module
 %define name smeserver-shared-folders
 Name: %{name}
 %define version 11.0.0
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,6 +21,7 @@ Requires: smeserver-formmagick >= 1.4.0-12
 Requires: smeserver-apache >= 2.6.0-19
 Requires: smeserver-mod_dav
 Requires: acl
+Requires: smeserver-rsyncd
 BuildRequires: perl
 BuildRequires: smeserver-devtools >= 1.11.0-03
 AutoReqProv: no
@@ -30,6 +31,9 @@ This module allows you to create network shares
 with more flexibility than ibays as it supports ACLs
 
 %changelog
+* Wed Oct 29 2025 Vasarhelyi Zsolt <zsoltv@koozali.org> 11.0.0-4.sme
+- Remove rsyncd and require smeserver-rsyncd [SME: 12252]
+
 * Mon Oct 06 2025 Brian Read <brianr@koozali.org> 11.0.0-3.sme
 - Add UTF8 and avoid potential DB caching problems [SME: 13209]
 
@@ -431,8 +435,6 @@ with more flexibility than ibays as it supports ACLs
 %setup
 
 %pre
-/usr/sbin/useradd -c "Rsyncd User" \
-        -s /sbin/nologin -r -d /dev/null rsync 2> /dev/null || :
 
 %post
 
@@ -441,7 +443,6 @@ with more flexibility than ibays as it supports ACLs
 mkdir -p root/etc/e-smith/web/{common,functions}
 mkdir -p root/etc/e-smith/web/panels/manager/{cgi-bin,common,html}
 mkdir -p root/home/e-smith/files/shares
-mkdir -p root/var/log/rsyncd
 mkdir -p root/home/e-smith/db/shares
 
 perl createlinks
@@ -452,9 +453,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     --file /etc/cron.daily/purge-shares-recycle 'attr(0755,root,root)' \
     --file /etc/sysconfig/modules/fuse.modules 'attr(0755,root,root)' \
-    --file /var/service/rsyncd/run 'attr(0755,root,root)' \
-    --file /var/service/rsyncd/log/run 'attr(0755,root,root)' \
-    --dir /var/log/rsyncd 'attr(0770,root,smelog)' \
     --dir /home/e-smith/db/shares 'attr(0750,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING"          >> %{name}-%{version}-%{release}-filelist