/[smeserver]/rpms/smeserver-spamassassin/sme10/smeserver-spamassassin-2.7.0-bz11362-logging.patch
ViewVC logotype

Contents of /rpms/smeserver-spamassassin/sme10/smeserver-spamassassin-2.7.0-bz11362-logging.patch

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


Revision 1.2 - (show annotations) (download)
Tue Mar 16 20:54:06 2021 UTC (3 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-spamassassin-2_7_0-12_el7_sme, smeserver-spamassassin-2_7_0-9_el7_sme, smeserver-spamassassin-2_7_0-11_el7_sme, smeserver-spamassassin-2_7_0-10_el7_sme, HEAD
Changes since 1.1: +1 -1 lines
* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-9.sme
- clean rsyslog syntax for spamd [SME: 11422]

1 diff -Nur smeserver-spamassassin-2.7.0.old/createlinks smeserver-spamassassin-2.7.0/createlinks
2 --- smeserver-spamassassin-2.7.0.old/createlinks 2021-02-19 00:56:23.637000000 -0500
3 +++ smeserver-spamassassin-2.7.0/createlinks 2021-02-19 01:01:07.008000000 -0500
4 @@ -33,6 +33,8 @@
5 event_link("systemd-reload", $event, "89"); # systemctl daemon-reload
6 event_link("spamassassin-update", $event, "99"); # Hopefully restarts spamassassin
7 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/spamd");
8 +templates2events("/etc/rsyslog.conf",$event);
9 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
10
11 # email-update events required?
12 $event = "email-update";
13 diff -Nur smeserver-spamassassin-2.7.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32spamd smeserver-spamassassin-2.7.0/root/etc/e-smith/templates/etc/rsyslog.conf/32spamd
14 --- smeserver-spamassassin-2.7.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32spamd 1969-12-31 19:00:00.000000000 -0500
15 +++ smeserver-spamassassin-2.7.0/root/etc/e-smith/templates/etc/rsyslog.conf/32spamd 2021-02-19 00:57:46.665000000 -0500
16 @@ -0,0 +1,5 @@
17 +
18 +#spamd
19 +:programname, isequal, "check" /var/log/spamd/spamd.log
20 +& stop
21 +
22 diff -Nur smeserver-spamassassin-2.7.0.old/root/etc/logrotate.d/spamd smeserver-spamassassin-2.7.0/root/etc/logrotate.d/spamd
23 --- smeserver-spamassassin-2.7.0.old/root/etc/logrotate.d/spamd 1969-12-31 19:00:00.000000000 -0500
24 +++ smeserver-spamassassin-2.7.0/root/etc/logrotate.d/spamd 2021-02-19 00:59:10.790000000 -0500
25 @@ -0,0 +1,13 @@
26 +/var/log/spamd/spamd.log
27 +{
28 + missingok
29 + notifempty
30 + sharedscripts
31 + delaycompress
32 + su root root
33 + create 600 root root
34 + postrotate
35 + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
36 + endscript
37 +}
38 +

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