smeserver-bandwidthd/contribs10/smeserver-bandwidthd-2.0.1.2-Update-createlinks-for-systemd-startup.patch

diff -urN smeserver-bandwidthd-2.0.1.2.old/createlinks smeserver-bandwidthd-2.0.1.2/createlinks
--- smeserver-bandwidthd-2.0.1.2.old/createlinks        2020-11-27 10:06:36.931211741 +0000
+++ smeserver-bandwidthd-2.0.1.2/createlinks    2020-11-27 10:22:50.918321270 +0000
@@ -26,22 +26,26 @@
 
 safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-begin");
 safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-end");
-safe_symlink("../../../functions/wrapper", "root/etc/e-smith/web/panels/manager/cgi-bin/bandwidthd");
+#safe_symlink("../../../functions/wrapper", "root/etc/e-smith/web/panels/manager/cgi-bin/bandwidthd");
+
+#Server manager link
+panel_link("bandwidthd","manager");
 
 # rpm update action (invoked by yum on install and update
-event_actions("smeserver-bandwidthd-update", qw(
-  bandwidthd-enable 20
-  bandwidthd-start 30
+$contrib = "smeserver-bandwidthd";
+event_actions("$contrib-update", qw(
+  systemd-default 10
 ));
 
-event_templates("smeserver-bandwidthd-update", qw(
+event_templates("$contrib-update", qw(
   /etc/httpd/conf/httpd.conf
   /etc/crontab
+  /etc/systemd/system-preset/49-koozali.preset
+
 ));
 
-event_services("smeserver-bandwidthd-update", qw(
+event_services("$contrib-update", qw(
   httpd-e-smith sigusr1
   php-fpm  reload
 ));
 
-
diff -urN smeserver-bandwidthd-2.0.1.2.old/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf smeserver-bandwidthd-2.0.1.2/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf
--- smeserver-bandwidthd-2.0.1.2.old/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf    1970-01-01 01:00:00.000000000 +0100
+++ smeserver-bandwidthd-2.0.1.2/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf        2020-11-27 18:52:30.994744196 +0000
@@ -0,0 +1,8 @@
+[Unit]
+After=wan.service
+After=networking.service
+[Service]
+ExecStartPre=-/sbin/e-smith/expand-template /etc/bandwidthd.conf
+[Install]
+WantedBy=sme-server.target
+
1	diff -urN smeserver-bandwidthd-2.0.1.2.old/createlinks smeserver-bandwidthd-2.0.1.2/createlinks
2	--- smeserver-bandwidthd-2.0.1.2.old/createlinks 2020-11-27 10:06:36.931211741 +0000
3	+++ smeserver-bandwidthd-2.0.1.2/createlinks 2020-11-27 10:22:50.918321270 +0000
4	@@ -26,22 +26,26 @@
5
6	safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-begin");
7	safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-end");
8	-safe_symlink("../../../functions/wrapper", "root/etc/e-smith/web/panels/manager/cgi-bin/bandwidthd");
9	+#safe_symlink("../../../functions/wrapper", "root/etc/e-smith/web/panels/manager/cgi-bin/bandwidthd");
10	+
11	+#Server manager link
12	+panel_link("bandwidthd","manager");
13
14	# rpm update action (invoked by yum on install and update
15	-event_actions("smeserver-bandwidthd-update", qw(
16	- bandwidthd-enable 20
17	- bandwidthd-start 30
18	+$contrib = "smeserver-bandwidthd";
19	+event_actions("$contrib-update", qw(
20	+ systemd-default 10
21	));
22
23	-event_templates("smeserver-bandwidthd-update", qw(
24	+event_templates("$contrib-update", qw(
25	/etc/httpd/conf/httpd.conf
26	/etc/crontab
27	+ /etc/systemd/system-preset/49-koozali.preset
28	+
29	));
30
31	-event_services("smeserver-bandwidthd-update", qw(
32	+event_services("$contrib-update", qw(
33	httpd-e-smith sigusr1
34	php-fpm reload
35	));
36
37	-
38	diff -urN smeserver-bandwidthd-2.0.1.2.old/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf smeserver-bandwidthd-2.0.1.2/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf
39	--- smeserver-bandwidthd-2.0.1.2.old/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf 1970-01-01 01:00:00.000000000 +0100
40	+++ smeserver-bandwidthd-2.0.1.2/root/usr/lib/systemd/system/bandwidthd.service.d/50koozali.conf 2020-11-27 18:52:30.994744196 +0000
41	@@ -0,0 +1,8 @@
42	+[Unit]
43	+After=wan.service
44	+After=networking.service
45	+[Service]
46	+ExecStartPre=-/sbin/e-smith/expand-template /etc/bandwidthd.conf
47	+[Install]
48	+WantedBy=sme-server.target
49	+