aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/opendmarc/handlers/main.yml4
-rw-r--r--ansible/roles/opendmarc/tasks/main.yml2
-rw-r--r--ansible/roles/opendmarc/templates/opendmarc.conf.j26
-rw-r--r--ansible/roles/opendmarc/vars/main.yml2
4 files changed, 7 insertions, 7 deletions
diff --git a/ansible/roles/opendmarc/handlers/main.yml b/ansible/roles/opendmarc/handlers/main.yml
index 4fe66b7..ce11676 100644
--- a/ansible/roles/opendmarc/handlers/main.yml
+++ b/ansible/roles/opendmarc/handlers/main.yml
@@ -1,5 +1,5 @@
---
-- name: Reload OpenDMARC
+- name: Restart OpenDMARC
service:
name: opendmarc
- state: reloaded
+ state: restarted
diff --git a/ansible/roles/opendmarc/tasks/main.yml b/ansible/roles/opendmarc/tasks/main.yml
index f236b4d..4743dd7 100644
--- a/ansible/roles/opendmarc/tasks/main.yml
+++ b/ansible/roles/opendmarc/tasks/main.yml
@@ -27,4 +27,4 @@
tags:
- role::opendmarc
notify:
- - Reload OpenDMARC
+ - Restart OpenDMARC
diff --git a/ansible/roles/opendmarc/templates/opendmarc.conf.j2 b/ansible/roles/opendmarc/templates/opendmarc.conf.j2
index 5bb596a..b5bff22 100644
--- a/ansible/roles/opendmarc/templates/opendmarc.conf.j2
+++ b/ansible/roles/opendmarc/templates/opendmarc.conf.j2
@@ -17,17 +17,17 @@ IgnoreAuthenticatedClients true
# IgnoreHosts /etc/opendmarc/ignore.hosts
RejectFailures true
+HoldQuarantinedMessages true
+
ReportCommand /usr/sbin/sendmail -t
RequiredHeaders true
Socket inet:8893@localhost
SoftwareHeader true
SPFIgnoreResults false
-TrustedAuthservIDs HOSTNAME
+TrustedAuthservIDs {{ opendmarc_authserv_id }}
PidFile /run/opendmarc/opendmarc.pid
PublicSuffixList /usr/share/publicsuffix/public_suffix_list.dat
-TrustedAuthservIDs HOSTNAME
-
UMask 0002
UserID opendmarc
diff --git a/ansible/roles/opendmarc/vars/main.yml b/ansible/roles/opendmarc/vars/main.yml
index bb3fe8d..63dbe7a 100644
--- a/ansible/roles/opendmarc/vars/main.yml
+++ b/ansible/roles/opendmarc/vars/main.yml
@@ -2,4 +2,4 @@
opendmarc_failures: "[email protected]"
opendmarc_failure_reports: "[email protected]"
opendmarc_failure_reports_from: "[email protected]"
-opendmarc_authserv_id: "PyDisDMARC"
+opendmarc_authserv_id: "mail.pydis.wtf"