From d7ce4b38c4bdd5a857956a3cf935cde6fa048234 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Thu, 18 Mar 2021 00:07:14 +0100
Subject: [PATCH] Update for EL8

---
 tasks/server.yml                | 8 ++++++++
 templates/etc/opendkim.conf.j2  | 8 ++++++--
 templates/etc/opendmarc.conf.j2 | 1 -
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tasks/server.yml b/tasks/server.yml
index a421cc5..651b19b 100644
--- a/tasks/server.yml
+++ b/tasks/server.yml
@@ -8,6 +8,14 @@
 #    - postfix_mydestination is defined
 #  register: certificat_changed
 
+- name: Install Certificat
+  include_role:
+    name: lego
+#  vars:
+#    certbot_certname: "{{ postfix_myhostname }}"
+  when:
+    - postfix_mydestination is defined
+
 - name: Include tasks for postgrey
   include_tasks: postgrey.yml
   when:
diff --git a/templates/etc/opendkim.conf.j2 b/templates/etc/opendkim.conf.j2
index b1a5529..990a7d6 100644
--- a/templates/etc/opendkim.conf.j2
+++ b/templates/etc/opendkim.conf.j2
@@ -10,11 +10,11 @@
 ## See /usr/share/doc/opendkim/INSTALL for detailed instructions.
 
 ## DEPRECATED CONFIGURATION OPTIONS
-## 
+##
 ## The following configuration options are no longer valid.  They should be
 ## removed from your existing configuration file to prevent potential issues.
 ## Failure to do so may result in opendkim being unable to start.
-## 
+##
 ## Removed in 2.10.0:
 ##   AddAllSignatureResults
 ##   ADSPAction
@@ -34,7 +34,11 @@ AutoRestart             Yes
 AutoRestartRate         10/1h
 
 ##  Specifies the path to the process ID file.
+{% if ansible_os_family == "RedHat" and ansible_distribution_major_version == '7' %}
 PidFile	/var/run/opendkim/opendkim.pid
+{% elif ansible_os_family == "RedHat" and ansible_distribution_major_version == '8' %}
+PidFile	/run/opendkim/opendkim.pid
+{% endif %}
 
 ##  Selects operating modes. Valid modes are s (sign) and v (verify). Default is v.
 ##  Must be changed to s (sign only) or sv (sign and verify) in order to sign outgoing
diff --git a/templates/etc/opendmarc.conf.j2 b/templates/etc/opendmarc.conf.j2
index f01ad17..190ebd4 100644
--- a/templates/etc/opendmarc.conf.j2
+++ b/templates/etc/opendmarc.conf.j2
@@ -1,4 +1,3 @@
-##
 ## opendmarc.conf -- configuration file for OpenDMARC filter
 ##
 ## Copyright (c) 2012-2015, The Trusted Domain Project.  All rights reserved.