/[smeserver]/rpms/smeserver-spamassassin/sme10/smeserver-spamassassin-2.7.0-bz11166-update.patch
ViewVC logotype

Annotation of /rpms/smeserver-spamassassin/sme10/smeserver-spamassassin-2.7.0-bz11166-update.patch

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


Revision 1.2 - (hide annotations) (download)
Fri Jan 8 19:49:49 2021 UTC (3 years, 9 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-spamassassin-2_7_0-12_el7_sme, smeserver-spamassassin-2_7_0-7_el7_sme, smeserver-spamassassin-2_7_0-5_el7_sme, smeserver-spamassassin-2_7_0-3_el7_sme, smeserver-spamassassin-2_7_0-4_el7_sme, smeserver-spamassassin-2_7_0-8_el7_sme, smeserver-spamassassin-2_7_0-9_el7_sme, smeserver-spamassassin-2_7_0-11_el7_sme, smeserver-spamassassin-2_7_0-6_el7_sme, smeserver-spamassassin-2_7_0-10_el7_sme, HEAD
Changes since 1.1: +6 -0 lines
* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.7.0-3.sme
- fix smeserver-spamassassin-update event fix [SME: 11166]

1 jpp 1.1 diff -Nur smeserver-spamassassin-2.7.0.old/createlinks smeserver-spamassassin-2.7.0/createlinks
2     --- smeserver-spamassassin-2.7.0.old/createlinks 2020-12-11 09:31:21.000000000 -0500
3     +++ smeserver-spamassassin-2.7.0/createlinks 2021-01-08 14:43:52.162000000 -0500
4     @@ -11,7 +11,7 @@
5    
6     # panel_link("otheremail", $panel);
7    
8     -my $event="spamassassin-update";
9     +my $event;
10    
11     foreach (qw(
12     /etc/mail/spamassassin/local.cf
13     @@ -24,17 +24,17 @@
14     bootstrap-console-save
15     console-save
16     email-update
17     + smeserver-spamassassin-update
18     ));
19     }
20    
21     -templates2events("/etc/systemd/system-preset/49-koozali.preset", "spamassassin-update");
22     -
23     # spamassassin-update events
24     +$event="smeserver-spamassassin-update";
25     event_link("systemd-default", $event, "88"); # updates all the service files etc
26     event_link("systemd-reload", $event, "89"); # systemctl daemon-reload
27     event_link("spamassassin-update", $event, "99"); # Hopefully restarts spamassassin
28     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/spamd");
29    
30     # email-update events required?
31     -#my $event = "email-update";
32     -#event_link("spamassassin-update", $event, "99"); # Hopefully restarts spamassassin
33     -
34     +$event = "email-update";
35     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/spamd");
36 jpp 1.2 diff -Nur smeserver-spamassassin-2.7.0.old/root/etc/e-smith/events/actions/spamassassin-update smeserver-spamassassin-2.7.0/root/etc/e-smith/events/actions/spamassassin-update
37     --- smeserver-spamassassin-2.7.0.old/root/etc/e-smith/events/actions/spamassassin-update 2020-12-11 09:44:01.000000000 -0500
38     +++ smeserver-spamassassin-2.7.0/root/etc/e-smith/events/actions/spamassassin-update 1969-12-31 19:00:00.000000000 -0500
39     @@ -1,2 +0,0 @@
40     -#!/usr/bin/bash
41     -/usr/bin/systemctl restart spamd

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