diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/createlinks mezzanine_patched_smeserver-qpsmtpd-2.4.0/createlinks
--- smeserver-qpsmtpd-2.4.0/createlinks	2016-04-24 22:59:50.843746833 +0200
+++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/createlinks	2016-04-24 21:46:05.733678782 +0200
@@ -40,6 +40,12 @@
 			ssl-update
 		      ));
 
+templates2events("/etc/mail-dmarc.ini", qw(
+                        bootstrap-console-save
+                        console-save
+                        email-update
+                      ));
+
 my $secure_service = "/var/service/sqpsmtpd";
 
 templates2events("$secure_service/runenv", qw(
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization
--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/100organization	2016-04-24 21:39:17.596705233 +0200
@@ -0,0 +1,5 @@
+[organization]
+domain             = { $DomainName }
+org_name           = { $ldap{defaultCompany} || 'SME Server powered company' }
+email              = { $qpsmtpd{DMARCReportEmail} || 'admin@' . $DomainName }
+extra_contact_info = { $qpsmtpd{DMARCContactInfo} || 'http://' . $DomainName }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore
--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/200ReportStore	2016-04-24 21:41:49.510695766 +0200
@@ -0,0 +1,3 @@
+[report_store]
+backend = SQL
+dsn     = dbi:SQLite:dbname=/var/lib/qpsmtpd/dmarc/reports.sqlite
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc
--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/300Dmarc	2016-04-24 21:42:00.151695081 +0200
@@ -0,0 +1,2 @@
+[dmarc]
+backend        = perl
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns
--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/400Dns	2016-04-24 22:59:17.480748995 +0200
@@ -0,0 +1,3 @@
+[dns]
+timeout            = 5
+public_suffix_list = public_suffix_list
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp
--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/etc/mail-dmarc.ini/500Smtp	2016-04-24 21:43:19.343689955 +0200
@@ -0,0 +1,2 @@
+[smtp]
+hostname  = { $SystemName . '.' . $DomainName }
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc
--- smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_smeserver-qpsmtpd-2.4.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/223dmarc	2016-04-24 13:19:58.634191870 +0200
@@ -0,0 +1 @@
+dmarc reject { $qpsmtpd{DMARCReject} || '0' } reporting { $qpsmtpd{DMARCReporting} || '0' }