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 +