diff -urN e-smith-proftpd-2.6.0.old/createlinks e-smith-proftpd-2.6.0/createlinks --- e-smith-proftpd-2.6.0.old/createlinks 2008-10-07 21:36:59.000000000 +0400 +++ e-smith-proftpd-2.6.0/createlinks 2020-11-27 22:32:57.824000000 +0400 @@ -3,14 +3,20 @@ use esmith::Build::CreateLinks qw(:all); safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/ftp"); -service_link_enhanced("ftp", "S85", "7"); +#service_link_enhanced("ftp", "S85", "7"); service_link_enhanced("ftp", "K25", "6"); service_link_enhanced("ftp", "K25", "0"); safe_symlink("proftpd", "root/var/service/ftp"); -templates2events("/etc/logrotate.d/proftpd", "bootstrap-console-save"); -templates2events("/etc/pam.d/ftp", "bootstrap-console-save"); +templates2events("/etc/logrotate.d/proftpd", qw( + bootstrap-console-save + e-smith-proftpd-update + )); +templates2events("/etc/pam.d/ftp", qw( + bootstrap-console-save + e-smith-proftpd-update + )); templates2events("/etc/ftpusers", qw( bootstrap-console-save network-create @@ -18,6 +24,7 @@ remoteaccess-update password-modify user-lock + e-smith-proftpd-update )); templates2events("/etc/proftpd.conf", qw( @@ -34,7 +41,9 @@ network-create network-delete remoteaccess-update - password-modify)); + password-modify + e-smith-proftpd-update + )); foreach my $event (qw( remoteaccess-update)) @@ -47,6 +56,7 @@ network-create remoteaccess-update network-delete + e-smith-proftpd-update )) { templates2events("/var/service/ftp/peers/0", $event); @@ -60,4 +70,9 @@ safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/ftp"); } +my $event = 'e-smith-proftpd-update'; +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ftp"); +templates2events("/etc/systemd/system-preset/49-koozali.preset", $event); +event_link("systemd-reload", $event, "89"); + exit 0; diff -urN e-smith-proftpd-2.6.0.old/root/usr/lib/systemd/system/ftp.service e-smith-proftpd-2.6.0/root/usr/lib/systemd/system/ftp.service --- e-smith-proftpd-2.6.0.old/root/usr/lib/systemd/system/ftp.service 1970-01-01 04:00:00.000000000 +0400 +++ e-smith-proftpd-2.6.0/root/usr/lib/systemd/system/ftp.service 2020-11-27 22:41:01.703000000 +0400 @@ -0,0 +1,15 @@ +[Unit] +Description=ftp (proftpd) +After=network.target +Conflicts=proftpd.service + +[Service] +Type=oneshot +ExecStartPre=/sbin/e-smith/service-status ftp +ExecStart=/usr/bin/sv u /service/ftp +ExecStop=/usr/bin/sv stop /service/ftp +ExecReload=/usr/bin/sv t /service/ftp +RemainAfterExit=yes + +[Install] +WantedBy=sme-server.target diff -urN e-smith-proftpd-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-ftp.preset e-smith-proftpd-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-ftp.preset --- e-smith-proftpd-2.6.0.old/root/usr/lib/systemd/system-preset/80-koozali-ftp.preset 1970-01-01 04:00:00.000000000 +0400 +++ e-smith-proftpd-2.6.0/root/usr/lib/systemd/system-preset/80-koozali-ftp.preset 2020-11-27 22:24:16.950000000 +0400 @@ -0,0 +1 @@ +enable ftp.service