Fix unit tests after sysvinit patch broke them #345
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On Debian-based distros /usr/lib/systemd doesn't exist while on Red Hat 7+ /lib is a symlink to /usr/lib. That means using /lib/systemd works on all supported distros. Fixes: 23242f9
bastelfreak
reviewed
Feb 23, 2021
| @@ -5,7 +5,7 @@ | |||
| class jira::params { | |||
| Exec { path => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'] } | |||
|
|
|||
| $service_file_location = '/usr/lib/systemd/system/jira.service' | |||
| $service_file_location = '/lib/systemd/system/jira.service' | |||
There was a problem hiding this comment.
can't we put it into /etc/systemd/system?
There was a problem hiding this comment.
I wouldn't mind that, but it does mean a migration. This was the easiest fix to the regression I introduced.
There was a problem hiding this comment.
okay, fine by me as a short term fix
bastelfreak
approved these changes
Feb 23, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: 23242f9
Now I do notice that my patch ends up moving the .service file on Debian-based OSes from /lib/systemd to /usr/lib/systemd. It was marked as a backwards incompatible change but it may still surprise users. Thoughts?