Make server parameter optional and allow service definition without explicit group #101
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
ekohl
approved these changes
Oct 2, 2017
eputnam
force-pushed
the
feature-optional-server-param
branch
from
171d9cd
to
4f29a2b
Compare
eputnam
changed the title
ekohl
reviewed
Oct 3, 2017
manifests/service.pp
Outdated
| if $user { | ||
| $_user = $user | ||
| } else { | ||
| $_user = $xinetd::params::default_user | ||
| } | ||
|
|
||
| if $group { | ||
| if $group or bool2num($use_default_group) == 0 { |
There was a problem hiding this comment.
Wouldn't this be equal to if $group or !use_default_group {?
ekohl
approved these changes
Oct 3, 2017
The group setting may be omitted in a service configuration to use the users primary group. This config is currently not possible because setting the group parameter to 'undef' will use the os specific default group instead. This patch adds an additional parameter 'use_default_group' to control this behaviour. Using the default 'true' keeps the old behaviour. Setting the parameter to 'false' and leaving the group unset will omit the group setting from the service config file.
According to the documentation, the server parameter is optional if a redirection is configured. This patch makes the server parameter optional. It includes a check to make sure at least one of the parameters is defined. The manpage xinetd.conf(5) defines the precedence rule if both parameters are defined, so that is not an error.
There's an unnecessary bool2num in service.pp that can be converted to simply check for not true.
eputnam
force-pushed
the
feature-optional-server-param
branch
from
3065087
to
d9993ed
Compare
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.
According to the documentation, the server parameter is optional if a
redirection is configured. This patch makes the server parameter
optional. It includes a check to make sure at least one of the
parameters is defined. The manpage xinetd.conf(5) defines the precedence
rule if both parameters are defined, so that is not an error.
The group setting may be omitted in a service configuration to use the users primary group. This config is currently not possible because setting the group parameter to undef will use the os specific default group instead. This patch adds an additional parameter use_default_group to control this behaviour. Using the default true keeps the old behaviour. Setting the parameter to false and leaving the group unset will omit the group setting from the service config file.
closes #77 and #78