/[smeserver]/rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd-2.6.0-inbound_dmarc.patch
ViewVC logotype

Contents of /rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd-2.6.0-inbound_dmarc.patch

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

Revision 1.1 - (show annotations) (download)
Fri May 6 09:46:47 2016 UTC (8 years, 6 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-qpsmtpd-2_6_0-39_el7_sme, smeserver-qpsmtpd-2_6_0-25_el7_sme, smeserver-qpsmtpd-2_6_0-33_el7_sme, smeserver-qpsmtpd-2_6_0-30_el7_sme, smeserver-qpsmtpd-2_6_0-29_el7_sme, smeserver-qpsmtpd-2_6_0-24_el7_sme, smeserver-qpsmtpd-2_6_0-34_el7_sme, smeserver-qpsmtpd-2_6_0-31_el7_sme, smeserver-qpsmtpd-2_6_0-32_el7_sme, smeserver-qpsmtpd-2_6_0-28_el7_sme, smeserver-qpsmtpd-2_6_0-38_el7_sme, smeserver-qpsmtpd-2_6_0-35_el7_sme, smeserver-qpsmtpd-2_6_0-40_el7_sme, smeserver-qpsmtpd-2_6_0-36_el7_sme, smeserver-qpsmtpd-2_6_0-20_el7_sme, smeserver-qpsmtpd-2_6_0-23_el7_sme, smeserver-qpsmtpd-2_6_0-37_el7_sme, smeserver-qpsmtpd-2_6_0-27_el7_sme, smeserver-qpsmtpd-2_6_0-22_el7_sme, smeserver-qpsmtpd-2_6_0-21_el7_sme, smeserver-qpsmtpd-2_6_0-26_el7_sme 
* Fri May 6 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-20.sme
- Enable DMARC checking and reporting [SME: 9206]
- Add helper to publish DKIM/DMARC/SPF policy [SME: 9496]
- Allow DKIM signing of outbound emails [SME: 9496]
- Possibility to reject on SPF failure [SME: 9479]
1 diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/createlinks mezzanine_patched_smeserver-qpsmtpd-2.6.0/createlinks
2 --- smeserver-qpsmtpd-2.6.0/createlinks 2016-04-24 22:59:50.843746833 +0200
3 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/createlinks 2016-04-24 21:46:05.733678782 +0200
4 @@ -40,6 +40,12 @@
5 ssl-update
6 ));
7
8 +templates2events("/etc/mail-dmarc.ini", qw(
9 + bootstrap-console-save
10 + console-save
11 + email-update
12 + ));
13 +
14 my $secure_service = "/var/service/sqpsmtpd";
15
16 templates2events("$secure_service/runenv", qw(
17 diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization
18 --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization 1970-01-01 01:00:00.000000000 +0100
19 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization 2016-04-24 21:39:17.596705233 +0200
20 @@ -0,0 +1,5 @@
21 +[organization]
22 +domain = { $DomainName }
23 +org_name = { $ldap{defaultCompany} || 'SME Server powered company' }
24 +email = { $qpsmtpd{DMARCReportEmail} || 'admin@' . $DomainName }
25 +extra_contact_info = { $qpsmtpd{DMARCContactInfo} || 'http://' . $DomainName }
26 diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore
27 --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore 1970-01-01 01:00:00.000000000 +0100
28 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore 2016-04-24 21:41:49.510695766 +0200
29 @@ -0,0 +1,3 @@
30 +[report_store]
31 +backend = SQL
32 +dsn = dbi:SQLite:dbname=/var/lib/qpsmtpd/dmarc/reports.sqlite
33 diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc
34 --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc 1970-01-01 01:00:00.000000000 +0100
35 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc 2016-04-24 21:42:00.151695081 +0200
36 @@ -0,0 +1,2 @@
37 +[dmarc]
38 +backend = perl
39 diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns
40 --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns 1970-01-01 01:00:00.000000000 +0100
41 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns 2016-04-24 22:59:17.480748995 +0200
42 @@ -0,0 +1,3 @@
43 +[dns]
44 +timeout = 5
45 +public_suffix_list = public_suffix_list
46 diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp
47 --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp 1970-01-01 01:00:00.000000000 +0100
48 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp 2016-04-24 21:43:19.343689955 +0200
49 @@ -0,0 +1,2 @@
50 +[smtp]
51 +hostname = { $SystemName . '.' . $DomainName }
52 diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc
53 --- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc 1970-01-01 01:00:00.000000000 +0100
54 +++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc 2016-04-24 13:19:58.634191870 +0200
55 @@ -0,0 +1 @@
56 +dmarc reject { $qpsmtpd{DMARCReject} || '0' } reporting { $qpsmtpd{DMARCReporting} || '0' }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed