/[smecontribs]/rpms/smeserver-bandwidthd/contribs10/smeserver-bandwidthd-2.0.1.2-bz12697.patch
ViewVC logotype

Annotation of /rpms/smeserver-bandwidthd/contribs10/smeserver-bandwidthd-2.0.1.2-bz12697.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Wed May 29 02:49:15 2024 UTC (6 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-bandwidthd-2_0_1_2-18_el7_sme, HEAD
* Tue May 28 2024 Jean-Philippe Pialasse <jpp@koozali.org> 2.0.1.2-18.sme
- expand config and restart on ip-up event [SME: 12697]
  also add external Gateway to monitor

1 jpp 1.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    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed