FreeBSD init: Remove unnecessary daemon -u option #1924
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
The rc.subr framework already takes care of substituting user. So, using daemon's -u option is double user-substitution and fails if $caddy_user is non-root.
|
|
mholt
reviewed
Oct 16, 2017
| @@ -62,7 +62,7 @@ fi | |||
| pidfile="/var/run/${name}.pid" | |||
| procname="${caddy_bin_path}" #enabled builtin pid checking for start / stop | |||
| command="/usr/sbin/daemon" | |||
| command_args="-u ${caddy_user} -p ${pidfile} /usr/bin/env ${caddy_env} ${procname} -cpu ${caddy_cpu} -log stdout -conf ${caddy_config_path} -agree -email ${caddy_cert_email} < /dev/null >> ${caddy_logfile} 2>&1" | |||
| command_args="-p ${pidfile} /usr/bin/env ${caddy_env} ${procname} -cpu ${caddy_cpu} -log stdout -conf ${caddy_config_path} -agree -email ${caddy_cert_email} < /dev/null >> ${caddy_logfile} 2>&1" | |||
There was a problem hiding this comment.
Wouldn't it be better to change the caddy_user value? Or remove the unused variable then?
There was a problem hiding this comment.
No. The ${name}_user variable (${name} is caddy here) is special and tells the init system to run the command as the specified user. A documentation can be found in the ${name}_user part of man rc.subr. Sorry for being unclear!
|
Thank you! |
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.
1. What does this change do, exactly?
Fixes #1923 by removing unnecessary
-u ${caddy_user}option for thedaemoncommand in the init script for FreeBSD.2. Please link to the relevant issues.
#1923
3. Which documentation changes (if any) need to be made because of this PR?
None
4. Checklist