Rebase pdxcat/xinetd against new upstream #15
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
| @@ -10,18 +10,37 @@ | |||
| # } | |||
| # | |||
| class xinetd { | |||
| include xinetd::params | |||
There was a problem hiding this comment.
One comment is that the usual pattern is to use inherits here so the rest of the module can reference $xinetd::package_name (etc.) instead of $xinetd::params::package_name and parameters can be added to the base class without editing the code elsewhere in the module.
The params class uses facts to set tailored filenames and paths for the node. This is desireable in order to support multiple operating systems.
Not all operating systems store their default xinetd configuration file in /etc/xinetd.conf. Converting from a flat file to a template in order to support those operating systems.
Make sure xinetd.d exists (not all OS packages automatically create such a file). Also rework init.pp order.
Add a bunch of extra xinetd::service parameters. Refactor a bit. Options that default to undef are not given a corresponding line in the xinetd service file, leaving their value to the xinetd default. Modified options: - bind = '0.0.0.0' + bind = undef New options: + access_times = undef + ensure = present + groups = 'yes' + log_on_failure = undef + log_type = undef + no_access = undef + only_from = undef + service_name = $title + xtype = undef
Previously, the file resource defaults in init.pp specified Package[$xinetd_service] as a dependency. This has some not-so-subtle problems. It has been fixed to use Package[$xinetd_package] as originally intended.
Whatever puppet is doing to restart the xinetd service, it's not working. Possibly puppet is issuing a "reload" command. Setting hasrestart to false will cause puppet to issue a stop command followed by a start command, which *does* do the right thing.
- Fix rebase errors
| $confdir = $xinetd::params::xinetd_confdir, | ||
| $conffile = $xinetd::params::xinetd_conffile, | ||
| $package = $xinetd::params::xinetd_package, | ||
| $service = $xinetd::params::xinetd_service |
There was a problem hiding this comment.
Could you make these service_name and package_name instead of service and package? It makes it a lot easier to grep through the module :)
Also, the xinetd_* variables in xinetd::params should probably match these names unless you have a reason otherwise.
- refactor xinetd class to be parameterized - rename $real_wait to $_wait to indicate it was munged - use validate_re function to verify tcp|udp - rename $xinetd_* to * - remove duplicate include xinetd - refactor template not to use scope.lookupvar - fix failing spec tests - add dependency on stdlib - add failure on unsupported osfamiles
hunner
added a commit
that referenced
this pull request
Jul 30, 2013
Rebase pdxcat/xinetd against new upstream
This was referenced Jul 30, 2013
Closed
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.
No description provided.