/[smecontribs]/rpms/smeserver-wbl/contribs9/smeserver-wbl-0.3.0.bz10124-event-to-avoid-unecessary-service-restart.patch
ViewVC logotype

Annotation of /rpms/smeserver-wbl/contribs9/smeserver-wbl-0.3.0.bz10124-event-to-avoid-unecessary-service-restart.patch

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


Revision 1.2 - (hide annotations) (download)
Sat May 6 04:40:56 2017 UTC (7 years, 5 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-wbl-0_3_0-18_el6_sme, smeserver-wbl-0_3_0-17_el6_sme, smeserver-wbl-0_3_0-16_el6_sme, smeserver-wbl-0_3_0-19_el6_sme, HEAD
Changes since 1.1: +1 -1 lines
* Sat May 06 2017 Jean-Philipe Pialasse <tests@pialasse.com> 0.3.0-16.sme
- avoid unecessary service restart on modifcation [SME: 10124]

1 unnilennium 1.1 diff -Nur smeserver-wbl-0.3.0.old/createlinks smeserver-wbl-0.3.0/createlinks
2     --- smeserver-wbl-0.3.0.old/createlinks 2017-05-06 00:23:58.252000000 -0400
3     +++ smeserver-wbl-0.3.0/createlinks 2017-05-06 00:30:55.133000000 -0400
4     @@ -14,6 +14,19 @@
5     templates2events("/var/service/qpsmtpd/config/whitelisthosts", "email-update");
6     templates2events("/var/service/qpsmtpd/config/whitelistsenders", "email-update");
7    
8     +# own event
9     +my $wbl = "smeserver-wbl-update";
10     +templates2events("/var/qmail/control/badmailfrom", "$wbl");
11     +templates2events("/var/service/qpsmtpd/config/badmailfrom", "$wbl");
12     +templates2events("/var/service/qpsmtpd/config/badhelo", "$wbl");
13     +templates2events("/var/service/qpsmtpd/config/whitelisthelo", "$wbl");
14     +templates2events("/var/service/qpsmtpd/config/whitelisthosts", "$wbl");
15     +templates2events("/var/service/qpsmtpd/config/whitelistsenders", "$wbl");
16     +templates2events("/etc/mail/spamassassin/local.cf", "$wbl");
17     +
18 unnilennium 1.2 +safe_symlink("restart", "root/etc/e-smith/events/$wbl/services2adjust/spamd");
19 unnilennium 1.1 +
20     +
21     ##Symlink qpsmtpd whitlist_soft plugin for external connections
22    
23     safe_symlink("../../plugins/11whitelist",
24     diff -Nur smeserver-wbl-0.3.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm smeserver-wbl-0.3.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm
25     --- smeserver-wbl-0.3.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm 2017-05-06 00:23:58.254000000 -0400
26     +++ smeserver-wbl-0.3.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/wbl.pm 2017-05-06 00:32:25.070000000 -0400
27     @@ -228,7 +228,7 @@
28     }
29    
30     ##Update email settings
31     - unless ( system ("/sbin/e-smith/signal-event", "email-update") == 0 ){
32     + unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
33     $fm->error('ERROR_UPDATING');
34     return undef;
35     }
36     @@ -321,7 +321,7 @@
37     }
38    
39     ##Update email settings
40     - unless ( system ("/sbin/e-smith/signal-event", "email-update") == 0 ){
41     + unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
42     $fm->error('ERROR_UPDATING');
43     return undef;
44     }
45     @@ -334,7 +334,7 @@
46     my $fm = shift;
47     my $q = $fm->{'cgi'};
48    
49     - unless ( system ("/sbin/e-smith/signal-event", "email-update") == 0 )
50     + unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 )
51     {
52     $fm->error('ERROR_UPDATING');
53     return undef;
54     @@ -394,7 +394,7 @@
55    
56     ##Update email settings
57    
58     - unless ( system ("/sbin/e-smith/signal-event", "email-update") == 0 ){
59     + unless ( system ("/sbin/e-smith/signal-event", "smeserver-wbl-update") == 0 ){
60     $fm->error('ERROR_UPDATING');
61     return undef;
62     }

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