Skip to content

duplicate init files on rhel7 and rhel6 #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

duplicate init files on rhel7 and rhel6 #569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,14 @@ def running_under_virtualenv():
data_files.append(('/etc/init',
['debian/diamond.upstart']))
if distro in ['centos', 'redhat', 'debian', 'fedora', 'oracle']:
data_files.append(('/etc/init.d',
['bin/init.d/diamond']))
data_files.append(('/var/log/diamond',
['.keep']))
if distro_major_version >= 7 and not distro == 'debian':
data_files.append(('/usr/lib/systemd/system',
['rpm/systemd/diamond.service']))
elif distro_major_version >= 6 and not distro == 'debian':
data_files.append(('/etc/init',
['rpm/upstart/diamond.conf']))
elif distro_major_version <= 6 and not distro == 'debian':
Copy link
Member

@shortdudey123 shortdudey123 Feb 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably be an else, otherwise debian will not get an init file

data_files.append(('/etc/init.d',
['bin/init.d/diamond']))

# Support packages being called differently on different distros

Expand Down