From 35bbd1bfff010b55854a156e06e1c528510910b8 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 14 Nov 2021 15:42:18 -0600
Subject: [PATCH] Add dkim and dmarc service

---
 defaults/main.yml                     | 3 ++-
 templates/Fedora/35/etc/opendkim.conf | 1 +
 vars/Fedora-35-default.yml            | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 261b45b..92948da 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
-# defaults file for ensure_postfix
\ No newline at end of file
+# defaults file for ensure_postfix
+postmaster_email: 'postmaster@example.com'
diff --git a/templates/Fedora/35/etc/opendkim.conf b/templates/Fedora/35/etc/opendkim.conf
index 5933b4e..7994b76 100644
--- a/templates/Fedora/35/etc/opendkim.conf
+++ b/templates/Fedora/35/etc/opendkim.conf
@@ -72,6 +72,7 @@ SendReports	yes
 ##  failure reports.  By default, the e-mail address of the user executing
 ##  the filter is used (executing_user@hostname).
 # ReportAddress	"Example.com Postmaster" <postmaster@example.com>
+ReportAddress "Postmaster" <{{ postmaster_email }}>
 
 ##  Add a DKIM-Filter header field to messages passing through this filter
 ##  to identify messages it has processed.
diff --git a/vars/Fedora-35-default.yml b/vars/Fedora-35-default.yml
index 1cb1006..b4d849e 100644
--- a/vars/Fedora-35-default.yml
+++ b/vars/Fedora-35-default.yml
@@ -26,6 +26,12 @@ firewall_list:
     service: 'smtp-submission'
     state: 'enabled'
 service_list:
+  - enabled: 'yes'
+    name: 'opendkim.service'
+    state: 'started'
+  - enabled: 'yes'
+    name: 'opendmarc.service'
+    state: 'started'
   - enabled: 'yes'
     name: 'postfix.service'
     state: 'started'