From 6dacbb59df2231509c4a41ead8e13968bc4c007c Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Thu, 25 Apr 2019 07:02:15 -0400
Subject: [PATCH] Use setup.py expand to fill out etc/dkimpy-milter.conf

---
 etc/dkimpy-milter.conf.in | 49 +++++++++++++++++++++++++++++++++++++++
 setup.py                  |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 etc/dkimpy-milter.conf.in

diff --git a/etc/dkimpy-milter.conf.in b/etc/dkimpy-milter.conf.in
new file mode 100644
index 0000000..433eb6c
--- /dev/null
+++ b/etc/dkimpy-milter.conf.in
@@ -0,0 +1,49 @@
+# This is a basic configuration that can easily be adapted to suit a standard
+# installation. For more advanced options, see dkimpy-milter.conf(5) and/or
+# /usr/share/doc/dkimpy-milter/examples/opendkim.conf.sample.
+
+# Log to syslog
+Syslog			yes
+
+# Required to use local socket with MTAs that access the socket as a non-
+# privileged user (e.g. Postfix)
+UMask			007
+
+# Sign for example.com with key in @SYSCONFDIR@/dkimkeys/dkim.key using
+# selector '2007' (e.g. 2007._domainkey.example.com)
+#Domain			example.com
+#KeyFile			@SYSCONFDIR@/mail/dkim.key
+#Selector		default
+
+# Commonly-used options; the commented-out versions show the defaults.
+#Canonicalization	relaxed/simple
+#Mode			sv
+
+# Socket local:@RUNSTATEDIR@/dkimpy-milter/dkimpy-milter.sock
+#
+# ##  Socket socketspec
+# ##
+# ##  Names the socket where this filter should listen for milter connections
+# ##  from the MTA.  Required.  Should be in one of these forms:
+# ##
+# ##  inet:port@address           to listen on a specific interface
+# ##  inet:port                   to listen on all interfaces
+# ##  local:/path/to/socket       to listen on a UNIX domain socket
+#
+Socket			inet:8892@localhost
+
+##  PidFile filename
+###      default /run/dkimpy-milter/dkimpy-milter.pid
+###
+###  Name of the file where the filter should write its pid before beginning
+###  normal operations.
+#
+PidFile			@RUNSTATEDIR@/dkimpy-milter/dkimpy-milter.pid
+
+##  Userid userid
+###      default dkimpy-milter
+###
+###  Change to user "userid" before starting normal operation?  May include
+###  a group ID as well, separated from the userid by a colon.
+#
+UserID			dkimpy-milter
diff --git a/setup.py b/setup.py
index fe7b17a..a960b52 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ class FileMacroExpand(distutils.cmd.Command):
         pass
 
     def run(self):
-        files = ['etc/dkimpy-milter.openrc',]
+        files = ['etc/dkimpy-milter.conf', 'etc/dkimpy-milter.openrc',]
         for infile in files:
             outfile = ''
             filein = open(infile + '.in')