smeserver-bandwidthd/contribs10/smeserver-bandwidthd-2.0.1.2-bz12697.patch

diff -Nur smeserver-bandwidthd-2.0.1.2.old/createlinks smeserver-bandwidthd-2.0.1.2/createlinks
--- smeserver-bandwidthd-2.0.1.2.old/createlinks        2024-05-28 22:27:45.094000000 -0400
+++ smeserver-bandwidthd-2.0.1.2/createlinks    2024-05-28 22:32:29.616000000 -0400
@@ -7,14 +7,15 @@
 
 # templates to expand
        templates2events("/etc/e-smith/sql/init/80bandwidthd", qw( conf-bandwidthd bootstrap-console-save  post-upgrade));
-       templates2events("/etc/bandwidthd.conf", qw( conf-bandwidthd bootstrap-console-save  post-upgrade));
-       templates2events("/var/www/bandwidthd/phphtdocs/config.conf", qw( conf-bandwidthd bootstrap-console-save  post-upgrade));
+       templates2events("/etc/bandwidthd.conf", qw( conf-bandwidthd bootstrap-console-save  post-upgrade ip-up));
+       templates2events("/var/www/bandwidthd/phphtdocs/config.conf", qw( conf-bandwidthd bootstrap-console-save  post-upgrade ip-up));
         templates2events("/etc/httpd/conf/httpd.conf", qw( conf-bandwidthd ));
 
 # services to launch on event
        safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/bandwidthd");
-       safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/httpd-e-smith");
-        safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/mysql.init");
+  safe_symlink("restart", "root/etc/e-smith/events/ip-up/services2adjust/bandwidthd");
+  safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/httpd-e-smith");
+  safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/mysql.init");
        safe_symlink("reload-or-restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/php74-php-fpm");
 
 safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-begin");
diff -Nur smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet
--- smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet    2024-05-28 22:27:45.037000000 -0400
+++ smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet        2024-05-28 22:34:25.326000000 -0400
@@ -47,7 +47,8 @@
        {
        #$externalNet =~ s/[0-9]+$)/0/g; 
        $OUT .= "subnet ". ${'ExternalInterface'}{'IPAddress'} ." ". ${'ExternalInterface'}{'Netmask'} ." \n";
-       }  
+  }  
+  $OUT .= "subnet ".  ${'ExternalInterface'}{'Gateway'} ." 255.255.255.255\n" if ${'ExternalInterface'}{'Gateway'};
 
 # subnet of adsl peer if(bandwidthd=service|remotePeers|enabled)
        
1	diff -Nur smeserver-bandwidthd-2.0.1.2.old/createlinks smeserver-bandwidthd-2.0.1.2/createlinks
2	--- smeserver-bandwidthd-2.0.1.2.old/createlinks 2024-05-28 22:27:45.094000000 -0400
3	+++ smeserver-bandwidthd-2.0.1.2/createlinks 2024-05-28 22:32:29.616000000 -0400
4	@@ -7,14 +7,15 @@
5
6	# templates to expand
7	templates2events("/etc/e-smith/sql/init/80bandwidthd", qw( conf-bandwidthd bootstrap-console-save post-upgrade));
8	- templates2events("/etc/bandwidthd.conf", qw( conf-bandwidthd bootstrap-console-save post-upgrade));
9	- templates2events("/var/www/bandwidthd/phphtdocs/config.conf", qw( conf-bandwidthd bootstrap-console-save post-upgrade));
10	+ templates2events("/etc/bandwidthd.conf", qw( conf-bandwidthd bootstrap-console-save post-upgrade ip-up));
11	+ templates2events("/var/www/bandwidthd/phphtdocs/config.conf", qw( conf-bandwidthd bootstrap-console-save post-upgrade ip-up));
12	templates2events("/etc/httpd/conf/httpd.conf", qw( conf-bandwidthd ));
13
14	# services to launch on event
15	safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/bandwidthd");
16	- safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/httpd-e-smith");
17	- safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/mysql.init");
18	+ safe_symlink("restart", "root/etc/e-smith/events/ip-up/services2adjust/bandwidthd");
19	+ safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/httpd-e-smith");
20	+ safe_symlink("restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/mysql.init");
21	safe_symlink("reload-or-restart", "root/etc/e-smith/events/conf-bandwidthd/services2adjust/php74-php-fpm");
22
23	safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/var/www/bandwidthd/phphtdocs/config.conf/template-begin");
24	diff -Nur smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet
25	--- smeserver-bandwidthd-2.0.1.2.old/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet 2024-05-28 22:27:45.037000000 -0400
26	+++ smeserver-bandwidthd-2.0.1.2/root/etc/e-smith/templates/etc/bandwidthd.conf/07subnet 2024-05-28 22:34:25.326000000 -0400
27	@@ -47,7 +47,8 @@
28	{
29	#$externalNet =~ s/[0-9]+$)/0/g;
30	$OUT .= "subnet ". ${'ExternalInterface'}{'IPAddress'} ." ". ${'ExternalInterface'}{'Netmask'} ." \n";
31	- }
32	+ }
33	+ $OUT .= "subnet ". ${'ExternalInterface'}{'Gateway'} ." 255.255.255.255\n" if ${'ExternalInterface'}{'Gateway'};
34
35	# subnet of adsl peer if(bandwidthd=service\|remotePeers\|enabled)
36