From 5d48b5ea2beb21183cca6657ac1e193ce1d6a58f Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Fri, 26 Apr 2019 18:09:27 -0400
Subject: [PATCH] Use expand in socket-acitvation files

---
 .../{dkimpy-milter.service => dkimpy-milter.service.in}         | 2 +-
 .../{dkimpy-milter.socket => dkimpy-milter.socket.in}           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename system/socket-activation/{dkimpy-milter.service => dkimpy-milter.service.in} (77%)
 rename system/socket-activation/{dkimpy-milter.socket => dkimpy-milter.socket.in} (83%)

diff --git a/system/socket-activation/dkimpy-milter.service b/system/socket-activation/dkimpy-milter.service.in
similarity index 77%
rename from system/socket-activation/dkimpy-milter.service
rename to system/socket-activation/dkimpy-milter.service.in
index 2116bb7..2af96e5 100644
--- a/system/socket-activation/dkimpy-milter.service
+++ 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=/usr/bin/dkimpy-milter /etc/dkimpy-milter.conf
+ExecStart=@BINDIR@/dkimpy-milter /etc/dkimpy-milter.conf
 User=dkimpy-milter
 
 [Install]
diff --git a/system/socket-activation/dkimpy-milter.socket b/system/socket-activation/dkimpy-milter.socket.in
similarity index 83%
rename from system/socket-activation/dkimpy-milter.socket
rename to system/socket-activation/dkimpy-milter.socket.in
index d4338a3..741a5e8 100644
--- a/system/socket-activation/dkimpy-milter.socket
+++ b/system/socket-activation/dkimpy-milter.socket.in
@@ -3,7 +3,7 @@ Description=DKIMpy Milter socket
 Documentation=man:dkimpy-milter(8) man:dkimpy-milter.conf(5)
 
 [Socket]
-ListenStream=/run/dkimpy-milter/dkimpy-milter.sock
+ListenStream=@RUNSTATEDIR@/dkimpy-milter.sock
 SocketMode=0660
 # override SocketGroup to grant access to members of another system group:
 SocketGroup=dkimpy-milter