smeserver-zabbix-agent/contribs10/smeserver-zabbix-agent-0.4.8-bz11515-sme10.patch

diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/createlinks smeserver-zabbix-agent-0.4.8/createlinks
--- smeserver-zabbix-agent-0.4.8.old/createlinks        2020-05-29 03:35:00.000000000 -0400
+++ smeserver-zabbix-agent-0.4.8/createlinks    2021-04-01 11:24:36.361000000 -0400
@@ -8,7 +8,7 @@
                      zabbix_agentd.conf.d/deprecated_netstat.conf zabbix_agentd.conf.d/deprecated_swap.conf
                      zabbix_agentd.conf.d/extip.conf zabbix_agentd.conf.d/mail.conf zabbix_agentd.conf.d/mysql.conf
                      zabbix_agentd.conf.d/phpki_certs.conf zabbix_agentd.conf.d/samba.conf zabbix_agentd.conf.d/block_devices.conf!){
-    templates2events("/etc/zabbix/$conf", qw(zabbix-agent-update bootstrap-console-save));
+    templates2events("/etc/zabbix/$conf", qw(zabbix-agent-update bootstrap-console-save smeserver-zabbix-agent-update));
 }
 templates2events("/etc/sudoers", "zabbix-agent-update");
 templates2events("/etc/rc.d/init.d/masq", "zabbix-agent-update");
@@ -18,8 +18,14 @@
 safe_symlink("restart", "root/etc/e-smith/events/zabbix-agent-update/services2adjust/zabbix-agent");
 safe_symlink("adjust", "root/etc/e-smith/events/zabbix-agent-update/services2adjust/masq");
 
-# Start and stop links
-service_link_enhanced("zabbix-agent", "S98", "7");
-service_link_enhanced("zabbix-agent", "K10", "6");
-service_link_enhanced("zabbix-agent", "K10", "0");
+$event="smeserver-zabbix-agent-update";
+templates2events("/etc/sudoers", $event);
+templates2events("/etc/rc.d/init.d/masq", $event);
+templates2events("/etc/crontab", $event);
 
+# Services to restart
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-agent");
+safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq");
+# systemd-specific action mandatory for this package-update event
+event_link("systemd-reload", $event, "89");
+event_link("systemd-default", $event, "88");
diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf smeserver-zabbix-agent-0.4.8/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf
--- smeserver-zabbix-agent-0.4.8.old/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf 1969-12-31 19:00:00.000000000 -0500
+++ smeserver-zabbix-agent-0.4.8/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf     2021-04-01 11:19:15.220000000 -0400
@@ -0,0 +1,5 @@
+[Service]
+ExecStartPre=-/sbin/e-smith/service-status zabbix-agent
+
+[Install]
+WantedBy=sme-server.target
diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/packages/.readme smeserver-zabbix-agent-0.4.8/.tito/packages/.readme
--- smeserver-zabbix-agent-0.4.8.old/.tito/packages/.readme     2020-05-29 03:35:00.000000000 -0400
+++ smeserver-zabbix-agent-0.4.8/.tito/packages/.readme 1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-the .tito/packages directory contains metadata files
-named after their packages. Each file has the latest tagged
-version and the project's relative directory.
diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/packages/smeserver-zabbix-agent smeserver-zabbix-agent-0.4.8/.tito/packages/smeserver-zabbix-agent
--- smeserver-zabbix-agent-0.4.8.old/.tito/packages/smeserver-zabbix-agent      2020-05-29 03:35:00.000000000 -0400
+++ smeserver-zabbix-agent-0.4.8/.tito/packages/smeserver-zabbix-agent  1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-0.4.8-1 ./
diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/tito.props smeserver-zabbix-agent-0.4.8/.tito/tito.props
--- smeserver-zabbix-agent-0.4.8.old/.tito/tito.props   2020-05-29 03:35:00.000000000 -0400
+++ smeserver-zabbix-agent-0.4.8/.tito/tito.props       1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-[buildconfig]
-builder = tito.builder.Builder
-tagger = tito.tagger.VersionTagger
-changelog_do_not_remove_cherrypick = 0
-changelog_format = %s (%ae)
-lib_dir = ../tito_libs
1	diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/createlinks smeserver-zabbix-agent-0.4.8/createlinks
2	--- smeserver-zabbix-agent-0.4.8.old/createlinks 2020-05-29 03:35:00.000000000 -0400
3	+++ smeserver-zabbix-agent-0.4.8/createlinks 2021-04-01 11:24:36.361000000 -0400
4	@@ -8,7 +8,7 @@
5	zabbix_agentd.conf.d/deprecated_netstat.conf zabbix_agentd.conf.d/deprecated_swap.conf
6	zabbix_agentd.conf.d/extip.conf zabbix_agentd.conf.d/mail.conf zabbix_agentd.conf.d/mysql.conf
7	zabbix_agentd.conf.d/phpki_certs.conf zabbix_agentd.conf.d/samba.conf zabbix_agentd.conf.d/block_devices.conf!){
8	- templates2events("/etc/zabbix/$conf", qw(zabbix-agent-update bootstrap-console-save));
9	+ templates2events("/etc/zabbix/$conf", qw(zabbix-agent-update bootstrap-console-save smeserver-zabbix-agent-update));
10	}
11	templates2events("/etc/sudoers", "zabbix-agent-update");
12	templates2events("/etc/rc.d/init.d/masq", "zabbix-agent-update");
13	@@ -18,8 +18,14 @@
14	safe_symlink("restart", "root/etc/e-smith/events/zabbix-agent-update/services2adjust/zabbix-agent");
15	safe_symlink("adjust", "root/etc/e-smith/events/zabbix-agent-update/services2adjust/masq");
16
17	-# Start and stop links
18	-service_link_enhanced("zabbix-agent", "S98", "7");
19	-service_link_enhanced("zabbix-agent", "K10", "6");
20	-service_link_enhanced("zabbix-agent", "K10", "0");
21	+$event="smeserver-zabbix-agent-update";
22	+templates2events("/etc/sudoers", $event);
23	+templates2events("/etc/rc.d/init.d/masq", $event);
24	+templates2events("/etc/crontab", $event);
25
26	+# Services to restart
27	+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-agent");
28	+safe_symlink("adjust", "root/etc/e-smith/events/$event/services2adjust/masq");
29	+# systemd-specific action mandatory for this package-update event
30	+event_link("systemd-reload", $event, "89");
31	+event_link("systemd-default", $event, "88");
32	diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf smeserver-zabbix-agent-0.4.8/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf
33	--- smeserver-zabbix-agent-0.4.8.old/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf 1969-12-31 19:00:00.000000000 -0500
34	+++ smeserver-zabbix-agent-0.4.8/root/usr/lib/systemd/system/zabbix-agent.service.d/51-koozali.conf 2021-04-01 11:19:15.220000000 -0400
35	@@ -0,0 +1,5 @@
36	+[Service]
37	+ExecStartPre=-/sbin/e-smith/service-status zabbix-agent
38	+
39	+[Install]
40	+WantedBy=sme-server.target
41	diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/packages/.readme smeserver-zabbix-agent-0.4.8/.tito/packages/.readme
42	--- smeserver-zabbix-agent-0.4.8.old/.tito/packages/.readme 2020-05-29 03:35:00.000000000 -0400
43	+++ smeserver-zabbix-agent-0.4.8/.tito/packages/.readme 1969-12-31 19:00:00.000000000 -0500
44	@@ -1,3 +0,0 @@
45	-the .tito/packages directory contains metadata files
46	-named after their packages. Each file has the latest tagged
47	-version and the project's relative directory.
48	diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/packages/smeserver-zabbix-agent smeserver-zabbix-agent-0.4.8/.tito/packages/smeserver-zabbix-agent
49	--- smeserver-zabbix-agent-0.4.8.old/.tito/packages/smeserver-zabbix-agent 2020-05-29 03:35:00.000000000 -0400
50	+++ smeserver-zabbix-agent-0.4.8/.tito/packages/smeserver-zabbix-agent 1969-12-31 19:00:00.000000000 -0500
51	@@ -1 +0,0 @@
52	-0.4.8-1 ./
53	diff -Nur --no-dereference smeserver-zabbix-agent-0.4.8.old/.tito/tito.props smeserver-zabbix-agent-0.4.8/.tito/tito.props
54	--- smeserver-zabbix-agent-0.4.8.old/.tito/tito.props 2020-05-29 03:35:00.000000000 -0400
55	+++ smeserver-zabbix-agent-0.4.8/.tito/tito.props 1969-12-31 19:00:00.000000000 -0500
56	@@ -1,6 +0,0 @@
57	-[buildconfig]
58	-builder = tito.builder.Builder
59	-tagger = tito.tagger.VersionTagger
60	-changelog_do_not_remove_cherrypick = 0
61	-changelog_format = %s (%ae)
62	-lib_dir = ../tito_libs