(SIMP-4477) Add fully qualified paths to startup scripts #52
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
- Fixed bug in which the stunnel systemd pre-exec script failed to execute completely, because one command did not have a fully qualified path. - Reworked stunnel systemd pre-exec scripts to only emit error messages when errors have occurred. - Tweaked workaround for munged /etc/resolv.conf problem in acceptance test. SIMP-4477 #close
jeefberkey
reviewed
Mar 7, 2018
| @@ -7,7 +7,8 @@ Wants=network-online.target | |||
|
|
|||
| [Service] | |||
| Type=simple | |||
| ExecStartPre=-/usr/bin/pkill -f "stunnel /etc/stunnel/stunnel.conf" -F /var/stunnel/var/opt/run/stunnel.pid ; rm /var/stunnel/var/opt/run/stunnel.pid | |||
| ExecStartPre=/bin/bash -c 'if test -f /var/stunnel/var/opt/run/stunnel.pid; then /usr/bin/pkill -f "stunnel /etc/stunnel/stunnel.conf" -F /var/stunnel/var/opt/run/stunnel.pid; fi' | |||
There was a problem hiding this comment.
The dash right after the equals here means that this step can have any exit code, if that makes this logic easier
There was a problem hiding this comment.
I opted to not use the dash to allow fail option, because systemctl status stunnel always prints out error messages about not being able to pkill or remove the lock file.
jeefberkey
approved these changes
Mar 8, 2018
op-ct
approved these changes
Mar 9, 2018
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.
execute completely, because one command did not have a fully
qualified path.
messages when errors have occurred.
acceptance test.
SIMP-4477 #close