e-smith-proftpd/sme10/e-smith-proftpd-2.6.0-bz11106_11150_systemd_update_event.patch

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
1	diff -urN e-smith-proftpd-2.6.0.old/createlinks e-smith-proftpd-2.6.0/createlinks
2	--- e-smith-proftpd-2.6.0.old/createlinks 2008-10-07 21:36:59.000000000 +0400
3	+++ e-smith-proftpd-2.6.0/createlinks 2020-11-27 22:32:57.824000000 +0400
4	@@ -3,14 +3,20 @@
5	use esmith::Build::CreateLinks qw(:all);
6
7	safe_symlink("../daemontools", "root/etc/rc.d/init.d/supervise/ftp");
8	-service_link_enhanced("ftp", "S85", "7");
9	+#service_link_enhanced("ftp", "S85", "7");
10	service_link_enhanced("ftp", "K25", "6");
11	service_link_enhanced("ftp", "K25", "0");
12
13	safe_symlink("proftpd", "root/var/service/ftp");
14
15	-templates2events("/etc/logrotate.d/proftpd", "bootstrap-console-save");
16	-templates2events("/etc/pam.d/ftp", "bootstrap-console-save");
17	+templates2events("/etc/logrotate.d/proftpd", qw(
18	+ bootstrap-console-save
19	+ e-smith-proftpd-update
20	+ ));
21	+templates2events("/etc/pam.d/ftp", qw(
22	+ bootstrap-console-save
23	+ e-smith-proftpd-update
24	+ ));
25	templates2events("/etc/ftpusers", qw(
26	bootstrap-console-save
27	network-create
28	@@ -18,6 +24,7 @@
29	remoteaccess-update
30	password-modify
31	user-lock
32	+ e-smith-proftpd-update
33	));
34
35	templates2events("/etc/proftpd.conf", qw(
36	@@ -34,7 +41,9 @@
37	network-create
38	network-delete
39	remoteaccess-update
40	- password-modify));
41	+ password-modify
42	+ e-smith-proftpd-update
43	+ ));
44
45	foreach my $event (qw(
46	remoteaccess-update))
47	@@ -47,6 +56,7 @@
48	network-create
49	remoteaccess-update
50	network-delete
51	+ e-smith-proftpd-update
52	))
53	{
54	templates2events("/var/service/ftp/peers/0", $event);
55	@@ -60,4 +70,9 @@
56	safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/ftp");
57	}
58
59	+my $event = 'e-smith-proftpd-update';
60	+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ftp");
61	+templates2events("/etc/systemd/system-preset/49-koozali.preset", $event);
62	+event_link("systemd-reload", $event, "89");
63	+
64	exit 0;
65	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
66	--- e-smith-proftpd-2.6.0.old/root/usr/lib/systemd/system/ftp.service 1970-01-01 04:00:00.000000000 +0400
67	+++ e-smith-proftpd-2.6.0/root/usr/lib/systemd/system/ftp.service 2020-11-27 22:41:01.703000000 +0400
68	@@ -0,0 +1,15 @@
69	+[Unit]
70	+Description=ftp (proftpd)
71	+After=network.target
72	+Conflicts=proftpd.service
73	+
74	+[Service]
75	+Type=oneshot
76	+ExecStartPre=/sbin/e-smith/service-status ftp
77	+ExecStart=/usr/bin/sv u /service/ftp
78	+ExecStop=/usr/bin/sv stop /service/ftp
79	+ExecReload=/usr/bin/sv t /service/ftp
80	+RemainAfterExit=yes
81	+
82	+[Install]
83	+WantedBy=sme-server.target