DandelionNStuff/dkimpy-milter-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More expand cleanups

Browse Source
This commit is contained in:
Scott Kitterman
2019-04-26 18:44:17 -04:00
parent c89bfdb9df
commit f73596a67e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/dkimpy-milter.conf.in
+4 -4
View File
@@ -19,7 +19,7 @@ UMask 007
#Canonicalization relaxed/simple #Canonicalization relaxed/simple
#Mode sv #Mode sv
# Socket local:@RUNSTATEDIR@/dkimpy-milter/dkimpy-milter.sock # Socket local:@RUNSTATEDIR@/dkimpy-milter.sock
# #
# ## Socket socketspec # ## Socket socketspec
# ## # ##
@@ -30,15 +30,15 @@ UMask 007
# ## inet:port to listen on all interfaces # ## inet:port to listen on all interfaces
# ## local:/path/to/socket to listen on a UNIX domain socket # ## local:/path/to/socket to listen on a UNIX domain socket
# #
Socket inet:8892@localhost #Socket inet:8892@localhost
## PidFile filename ## PidFile filename
### default /run/dkimpy-milter/dkimpy-milter.pid ### default /run/dkimpy-milter/kimpy-milter.pid
### ###
### Name of the file where the filter should write its pid before beginning ### Name of the file where the filter should write its pid before beginning
### normal operations. ### normal operations.
# #
PidFile @RUNSTATEDIR@/dkimpy-milter/dkimpy-milter.pid PidFile @RUNSTATEDIR@/dkimpy-milter.pid
## Userid userid ## Userid userid
### default dkimpy-milter ### default dkimpy-milter
setup.py
+3 -2
View File
@@ -31,7 +31,7 @@ class FileMacroExpand(distutils.cmd.Command):
('sysconfigdir=', 'e', 'Specify system configuration directory. [/usr/local/etc]'), ('sysconfigdir=', 'e', 'Specify system configuration directory. [/usr/local/etc]'),
('sbindir=', 's', 'Specify system binary directory. [/usr/local/sbin]'), ('sbindir=', 's', 'Specify system binary directory. [/usr/local/sbin]'),
('bindir=', 'b', 'Specify binary directory. [/usr/loca/bin]'), ('bindir=', 'b', 'Specify binary directory. [/usr/loca/bin]'),
('rundir=', 'r', 'Specify run state directory. [/run/dkimpy-milter]'), ('rundir=', 'r', 'Specify run state directory. [/run]'),
] ]
def initialize_options(self): def initialize_options(self):
@@ -42,6 +42,7 @@ class FileMacroExpand(distutils.cmd.Command):
def finalize_options(self): def finalize_options(self):
self.configdir = self.sysconfigdir + '/dkimpy-milter' self.configdir = self.sysconfigdir + '/dkimpy-milter'
self.rundir += '/dkimpy-milter'
def run(self): def run(self):
files = ['etc/dkimpy-milter.conf', 'man/dkimpy-milter.conf.5', \ files = ['etc/dkimpy-milter.conf', 'man/dkimpy-milter.conf.5', \
@@ -53,7 +54,7 @@ class FileMacroExpand(distutils.cmd.Command):
outfile = '' outfile = ''
filein = open(infile + '.in') filein = open(infile + '.in')
for line in filein: for line in filein:
for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@", "@GREP@"]: for function in ["@SYSCONFDIR@", "@CONFDIR@", "@SBINDIR@", "@BINDIR@", "@RUNSTATEDIR@"]:
splitline = line.split(function) splitline = line.split(function)
if len(splitline) > 1: if len(splitline) > 1:
if function == "@SYSCONFDIR@": if function == "@SYSCONFDIR@":