From 518a66d60b8fd0bbe7c3041f4832025e2cce3ed3 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 => dkimpy-milter.conf.in} | 10 +++++-----
 setup.py                                          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename etc/{dkimpy-milter.conf => dkimpy-milter.conf.in} (82%)

diff --git a/etc/dkimpy-milter.conf b/etc/dkimpy-milter.conf.in
similarity index 82%
rename from etc/dkimpy-milter.conf
rename to etc/dkimpy-milter.conf.in
index 8d5419f..433eb6c 100644
--- a/etc/dkimpy-milter.conf
+++ b/etc/dkimpy-milter.conf.in
@@ -9,17 +9,17 @@ Syslog			yes
 # privileged user (e.g. Postfix)
 UMask			007
 
-# Sign for example.com with key in /etc/dkimkeys/dkim.key using
+# Sign for example.com with key in @SYSCONFDIR@/dkimkeys/dkim.key using
 # selector '2007' (e.g. 2007._domainkey.example.com)
 #Domain			example.com
-#KeyFile			/etc/mail/dkim.key
+#KeyFile			@SYSCONFDIR@/mail/dkim.key
 #Selector		default
 
 # Commonly-used options; the commented-out versions show the defaults.
 #Canonicalization	relaxed/simple
 #Mode			sv
 
-# Socket local:/var/run/dkimpy-milter/dkimpy-milter.sock
+# Socket local:@RUNSTATEDIR@/dkimpy-milter/dkimpy-milter.sock
 #
 # ##  Socket socketspec
 # ##
@@ -33,12 +33,12 @@ UMask			007
 Socket			inet:8892@localhost
 
 ##  PidFile filename
-###      default /var/run/dkimpy-milter/dkimpy-milter.pid
+###      default /run/dkimpy-milter/dkimpy-milter.pid
 ###
 ###  Name of the file where the filter should write its pid before beginning
 ###  normal operations.
 #
-PidFile			/run/dkimpy-milter/dkimpy-milter.pid
+PidFile			@RUNSTATEDIR@/dkimpy-milter/dkimpy-milter.pid
 
 ##  Userid userid
 ###      default 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')