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

Use config module

Browse Source
This commit is contained in:
Scott Kitterman
2018-02-12 12:31:53 -05:00
parent 8cc5c88fec
commit c6f4541be9
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkimpy_milter/__init__.py
+16 -8
View File
@@ -268,11 +268,19 @@ class dkimMilter(Milter.Base):
return res return res
if __name__ == "__main__": if __name__ == "__main__":
Milter.factory = dkimMilter Milter.factory = dkimpyMilter
Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS) Milter.set_flags(Milter.CHGHDRS + Milter.ADDHDRS)
global config #global config
config = read_config(['dkim-milter.cfg','/etc/mail/dkim-milter.cfg']) #config = read_config(['dkim-milter.cfg','/etc/mail/dkim-milter.cfg'])
miltername = config.miltername configFile = '/etc/dkimpymilter.conf'
socketname = config.socketname if len(sys.argv) > 1:
sys.stdout.flush() if sys.argv[1] in ( '-?', '--help', '-h' ):
Milter.runmilter(miltername,socketname,240) print('usage: dkimpy-milter [<configfilename>]')
sys.exit(1)
configFile = sys.argv[1]
configGlobal = dkimpy-milter.config._processConfigFile(filename = configFile)
miltername = config.miltername
socketname = config.socketname
sys.stdout.flush()
Milter.runmilter(miltername,socketname,240)