From fe22263513d2cb90e5d38a6ce9a61ac85675e74c Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 14 May 2023 22:26:19 -0500
Subject: [PATCH] Convert back to INET sockets for milters

---
 templates/Fedora/38/etc/opendkim.conf   |  4 ++--
 templates/Fedora/38/etc/opendmarc.conf  |  4 ++--
 templates/Fedora/38/etc/postfix/main.cf |  4 ++--
 vars/Fedora-38-default.yml              | 10 ++++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/templates/Fedora/38/etc/opendkim.conf b/templates/Fedora/38/etc/opendkim.conf
index aefddf4..1e26622 100644
--- a/templates/Fedora/38/etc/opendkim.conf
+++ b/templates/Fedora/38/etc/opendkim.conf
@@ -53,8 +53,8 @@ LogWhy	yes
 UserID	opendkim:opendkim
 
 ##  Create a socket through which your MTA can communicate.
-#Socket	inet:8891@localhost
-Socket local:/run/opendkim/opendkim.sock
+Socket	inet:8891@localhost
+#Socket local:/run/opendkim/opendkim.sock
 
 ##  Required to use local socket with MTAs that access the socket as a non-
 ##  privileged user (e.g. Postfix)
diff --git a/templates/Fedora/38/etc/opendmarc.conf b/templates/Fedora/38/etc/opendmarc.conf
index 7589033..19f6b7b 100644
--- a/templates/Fedora/38/etc/opendmarc.conf
+++ b/templates/Fedora/38/etc/opendmarc.conf
@@ -360,8 +360,8 @@ RejectFailures true
 ##  either in the configuration file or on the command line.  If an IP
 ##  address is used, it must be enclosed in square brackets.
 #
-# Socket inet:8893@localhost
-Socket local:/run/opendmarc/opendmarc.sock
+Socket inet:8893@localhost
+#Socket local:/run/opendmarc/opendmarc.sock
 
 ##  SoftwareHeader { true | false }
 ##  	default "false"
diff --git a/templates/Fedora/38/etc/postfix/main.cf b/templates/Fedora/38/etc/postfix/main.cf
index 98f02e6..e7c5ce2 100644
--- a/templates/Fedora/38/etc/postfix/main.cf
+++ b/templates/Fedora/38/etc/postfix/main.cf
@@ -753,9 +753,9 @@ shlib_directory = /usr/lib64/postfix
 {% if ensure_postfix.milter_list is defined and ensure_postfix.milter_list is iterable %}
 # The Milter List
 {% for milter in ensure_postfix.milter_list %}
-# -- {{ milter.description }} -- {{ milter.protocol }}:{{ milter.destination }}
+# -- {{ milter.description }} -- {{ milter.protocol }}:{{ milter.hostname }}:{{ milter.port }}
 {% endfor %}
-smtpd_milters = {% for milter in ensure_postfix.milter_list %} {{ milter.protocol }}:{{ milter.destination }} {% endfor %}
+smtpd_milters = {% for milter in ensure_postfix.milter_list %} {{ milter.protocol }}:{{ milter.hostname }}:{{ milter.port }} {% endfor %}
 {% endif %}
 
 {% if postfix_domains is defined and postfix_domains is iterable %}
diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml
index 294cb3c..d2f418d 100644
--- a/vars/Fedora-38-default.yml
+++ b/vars/Fedora-38-default.yml
@@ -2,11 +2,13 @@
 # vars file for ensure_postfix
 milter_list:
   - description: 'OpenDKIM'
-    destination: '/run/opendkim/opendkim.sock'
-    protocol: 'local'
+    hostname: 'localhost'
+    port: '8891'
+    protocol: 'inet'
   - description: 'OpenDMARC'
-    destination: '/run/opendmarc/opendmarc.sock'
-    protocol: 'local'
+    hostname: 'localhost'
+    port: '8893'
+    protocol: 'inet'
 package_list:
   - name: 'opendkim'
     state: 'present'