Fix setup.py install locations so they are installed correctly and drop unneeded README changes.
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
0.9.5.1 2018-03-10
|
0.9.5.1 2018-03-10
|
||||||
- Add conf file location to systemd unit file
|
- Add conf file location to systemd unit file
|
||||||
- Add information to README about manually putting init scripts in the right
|
- Fix setup.py install locations so they are installed correctly
|
||||||
locations
|
|
||||||
|
|
||||||
0.9.5 2018-03-10
|
0.9.5 2018-03-10
|
||||||
- Beta 1 (updated Alpha -> Beta warning in README and trove classifiers)
|
- Beta 1 (updated Alpha -> Beta warning in README and trove classifiers)
|
||||||
|
|||||||
@@ -13,12 +13,6 @@ default is a feature:
|
|||||||
|
|
||||||
python setup.py install --single-version-externally-managed --record=/dev/null
|
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
|
For users of Debian Stable (Debian 9, Codename Squueze), all dependencies are
|
||||||
available in either the main or backports repositories:
|
available in either the main or backports repositories:
|
||||||
|
|
||||||
|
|||||||
@@ -324,7 +324,7 @@ def main():
|
|||||||
global privateEd25519
|
global privateEd25519
|
||||||
privateRSA = False
|
privateRSA = False
|
||||||
privateEd25519 = False
|
privateEd25519 = False
|
||||||
configFile = '/etc/dkimpy-milter.conf'
|
configFile = '/usr/loca/etc/dkimpy-milter.conf'
|
||||||
if len(sys.argv) > 1:
|
if len(sys.argv) > 1:
|
||||||
if sys.argv[1] in ('-?', '--help', '-h'):
|
if sys.argv[1] in ('-?', '--help', '-h'):
|
||||||
print('usage: dkimpy-milter [<configfilename>]')
|
print('usage: dkimpy-milter [<configfilename>]')
|
||||||
|
|||||||
@@ -59,8 +59,8 @@ setup(
|
|||||||
data_files=[(os.path.join('share', 'man', 'man5'),
|
data_files=[(os.path.join('share', 'man', 'man5'),
|
||||||
['man/dkimpy-milter.conf.5']), (os.path.join('share', 'man', 'man8'),
|
['man/dkimpy-milter.conf.5']), (os.path.join('share', 'man', 'man8'),
|
||||||
['man/dkimpy-milter.8']), ('etc', ['etc/dkimpy-milter.conf']),
|
['man/dkimpy-milter.8']), ('etc', ['etc/dkimpy-milter.conf']),
|
||||||
(os.path.join('/lib', 'systemd', 'system'),
|
(os.path.join('lib', 'systemd', 'system'),
|
||||||
['system/dkimpy-milter.service']),(os.path.join('/etc', 'init.d'),
|
['system/dkimpy-milter.service']),(os.path.join('etc', 'init.d'),
|
||||||
['system/dkimpy-milter'])],
|
['system/dkimpy-milter'])],
|
||||||
zip_safe = False,
|
zip_safe = False,
|
||||||
**kw
|
**kw
|
||||||
|
|||||||
Reference in New Issue
Block a user