From 1d8c309da93b077f40bc93362a3331080039647f Mon Sep 17 00:00:00 2001 From: Scott Kitterman Date: Sat, 10 Mar 2018 20:06:21 -0500 Subject: [PATCH] Fix setup.py install locations so they are installed correctly and drop unneeded README changes. --- CHANGES | 3 +-- README | 6 ------ dkimpy_milter/__init__.py | 2 +- setup.py | 4 ++-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index b153bdd..e3186aa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,6 @@ 0.9.5.1 2018-03-10 - Add conf file location to systemd unit file - - Add information to README about manually putting init scripts in the right - locations + - Fix setup.py install locations so they are installed correctly 0.9.5 2018-03-10 - Beta 1 (updated Alpha -> Beta warning in README and trove classifiers) diff --git a/README b/README index 54f980d..1bfb561 100644 --- a/README +++ b/README @@ -13,12 +13,6 @@ default is a feature: python setup.py install --single-version-externally-managed --record=/dev/null -This should install everything, except for the service/init scripts to the -correct locations. dkimpy-milter.service needs to be manually copied to -/lib/systemd/system (on Debian, location may be different on other -distributions or operating systems). Similary, the sysv init script needs to -be copied to /etc/init.d for sysv users. - For users of Debian Stable (Debian 9, Codename Squueze), all dependencies are available in either the main or backports repositories: diff --git a/dkimpy_milter/__init__.py b/dkimpy_milter/__init__.py index 4555959..903b6eb 100644 --- a/dkimpy_milter/__init__.py +++ b/dkimpy_milter/__init__.py @@ -324,7 +324,7 @@ def main(): global privateEd25519 privateRSA = False privateEd25519 = False - configFile = '/etc/dkimpy-milter.conf' + configFile = '/usr/loca/etc/dkimpy-milter.conf' if len(sys.argv) > 1: if sys.argv[1] in ('-?', '--help', '-h'): print('usage: dkimpy-milter []') diff --git a/setup.py b/setup.py index 9effb55..223a25f 100644 --- a/setup.py +++ b/setup.py @@ -59,8 +59,8 @@ setup( data_files=[(os.path.join('share', 'man', 'man5'), ['man/dkimpy-milter.conf.5']), (os.path.join('share', 'man', 'man8'), ['man/dkimpy-milter.8']), ('etc', ['etc/dkimpy-milter.conf']), - (os.path.join('/lib', 'systemd', 'system'), - ['system/dkimpy-milter.service']),(os.path.join('/etc', 'init.d'), + (os.path.join('lib', 'systemd', 'system'), + ['system/dkimpy-milter.service']),(os.path.join('etc', 'init.d'), ['system/dkimpy-milter'])], zip_safe = False, **kw