From c89bfdb9df1cdc8074c3f00916e93bc7c8498c09 Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Fri, 26 Apr 2019 18:36:12 -0400
Subject: [PATCH] Split out sysconfdir (/etc) and confdir (/etc/dkimpy-milter)
 in expand

---
 man/dkimpy-milter.conf.5.in                       |  2 +-
 setup.py                                          | 10 ++++++----
 system/dkimpy-milter.in                           |  6 +++---
 system/dkimpy-milter.openrc.in                    |  2 +-
 system/dkimpy-milter.service.in                   |  2 +-
 system/socket-activation/dkimpy-milter.service.in |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/man/dkimpy-milter.conf.5.in b/man/dkimpy-milter.conf.5.in
index 1573570..1bdf341 100644
--- a/man/dkimpy-milter.conf.5.in
+++ b/man/dkimpy-milter.conf.5.in
@@ -159,7 +159,7 @@ Command line invocation of parameters as is done by OpenDKIM is not supported.
 
 .SH "USAGE"
 Usage:
-  dkimpy-milter [@SYSCONFDIR@/dkimpy-milter.conf]
+  dkimpy-milter [@CONFDIR@/dkimpy-milter.conf]
 
 .SH "OTHER DOCUMENTATION"
 This documentation assumes you have read Postfix's README_FILES/MILTER_README
diff --git a/setup.py b/setup.py
index e9d6e5d..2a5061e 100644
--- a/setup.py
+++ b/setup.py
@@ -28,20 +28,20 @@ description = "Domain Keys Identified Mail (DKIM) signing/verifying milter for P
 class FileMacroExpand(distutils.cmd.Command):
     description = "Expand @@ variables in input files, simlar to make macros."
     user_options = [
-        ('sysconfigdir=', 'e', 'Specify configuration directory. [/usr/local/etc/dkimpy-milter]'),
+        ('sysconfigdir=', 'e', 'Specify system configuration directory. [/usr/local/etc]'),
         ('sbindir=', 's', 'Specify system binary directory. [/usr/local/sbin]'),
         ('bindir=', 'b', 'Specify binary directory. [/usr/loca/bin]'),
         ('rundir=', 'r', 'Specify run state directory. [/run/dkimpy-milter]'),
     ]
 
     def initialize_options(self):
-        self.sysconfigdir = '/usr/local/etc/dkimpy-milter'
+        self.sysconfigdir = '/usr/local/etc'
         self.sbindir = '/usr/local/sbin'
         self.bindir = '/usr/local/bin'
         self.rundir = '/run/dkimpy-milter'
 
     def finalize_options(self):
-        pass
+        self.configdir = self.sysconfigdir + '/dkimpy-milter'
 
     def run(self):
         files = ['etc/dkimpy-milter.conf', 'man/dkimpy-milter.conf.5', \
@@ -53,11 +53,13 @@ class FileMacroExpand(distutils.cmd.Command):
             outfile = ''
             filein = open(infile + '.in')
             for line in filein:
-                for function in ["@SYSCONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@", "@GREP@"]:
+                for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@", "@GREP@"]:
                     splitline = line.split(function)
                     if len(splitline) > 1:
                         if function == "@SYSCONFDIR@":
                             line = splitline[0] + self.sysconfigdir + splitline[1]
+                        elif function == "@CONFDIR@":
+                            line = splitline[0] + self.configdir + splitline[1]
                         elif function == "@SBINDIR@":
                             line = splitline[0] + self.sbindir + splitline[1]
                         elif function == "@BINDIR@":
diff --git a/system/dkimpy-milter.in b/system/dkimpy-milter.in
index bce115a..90a6666 100644
--- a/system/dkimpy-milter.in
+++ b/system/dkimpy-milter.in
@@ -18,7 +18,7 @@
 # Short-Description: dkimpy-milter
 # Description:       Python DKIM Milter for Sendmail and Postfix
 ### END INIT INFO
-sysconfdir="@SYSCONFDIR@"
+sysconfdir="@CONFDIR@"
 bindir="@BINDIR@"
 RUNDIR="@RUNSTATEDIR@"
 DAEMON=${bindir}/dkimpy-milter
@@ -33,8 +33,8 @@ test -x $DAEMON || exit 0
 
 # Include dkimpy-python defaults if available
 # Typically not used
-if [ -f /etc/default/dkimpy-milter ] ; then
-	. /etc/default/dkimpy-milter
+if [ -f @SYSCONFDIR@/default/dkimpy-milter ] ; then
+	. @SYSCONFDIR@/default/dkimpy-milter
 fi
 
 set -e
diff --git a/system/dkimpy-milter.openrc.in b/system/dkimpy-milter.openrc.in
index 7566682..1334fd1 100644
--- a/system/dkimpy-milter.openrc.in
+++ b/system/dkimpy-milter.openrc.in
@@ -2,7 +2,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CONFFILE="@SYSCONFDIR@/${RC_SVCNAME}.conf"
+CONFFILE="@CONFDIR@/${RC_SVCNAME}.conf"
 required_files="${CONFFILE}"
 
 command="@BINDIR@/dkimpy-milter"
diff --git a/system/dkimpy-milter.service.in b/system/dkimpy-milter.service.in
index cd45225..b13dfd9 100644
--- a/system/dkimpy-milter.service.in
+++ b/system/dkimpy-milter.service.in
@@ -6,7 +6,7 @@ After=network.target
 [Service]
 Type=simple
 PIDFile=@RUNSTATEDIR@/dkimpy-milter.pid
-ExecStart=@BINDIR@/dkimpy-milter @SYSCONFDIR@/dkimpy-milter.conf
+ExecStart=@BINDIR@/dkimpy-milter @CONFDIR@/dkimpy-milter.conf
 
 [Install]
 WantedBy=multi-user.target
diff --git a/system/socket-activation/dkimpy-milter.service.in b/system/socket-activation/dkimpy-milter.service.in
index bd217fe..70e27f0 100644
--- a/system/socket-activation/dkimpy-milter.service.in
+++ b/system/socket-activation/dkimpy-milter.service.in
@@ -4,7 +4,7 @@ Documentation=man:dkimpy-milter(8) man:dkimpy-milter.conf(5)
 Requires=dkimpy-milter.socket
 
 [Service]
-ExecStart=@BINDIR@/dkimpy-milter @SYSCONFDIR@/dkimpy-milter.conf
+ExecStart=@BINDIR@/dkimpy-milter @CONFDIR@/dkimpy-milter.conf
 User=dkimpy-milter
 
 [Install]