Fix setup.py install locations so they are installed correctly and drop unneeded README changes.

This commit is contained in:
Scott Kitterman
2018-03-10 20:06:21 -05:00
parent 4d5961e4d5
commit 1d8c309da9
4 changed files with 4 additions and 11 deletions
+1 -2
View File
@@ -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)
-6
View File
@@ -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:
+1 -1
View File
@@ -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 [<configfilename>]')
+2 -2
View File
@@ -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