[Modules 5385] Include support for Apache 2.4 mod_authz_host directives in apache::mod::status #1667
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
|
Now with spec tests for all reasonable options for
After lots of corrections in spec test (since I'm a beginner in that still) and a minor correction in helper template, all tests pass. I'd like to read other people opinions about the path I'm going. In the absence of issues with that, I intend to replicate this in the other affected classes. |
ekohl
reviewed
Aug 16, 2017
manifests/mod/status.pp
Outdated
| @@ -26,7 +26,8 @@ | |||
| # } | |||
| # | |||
| class apache::mod::status ( | |||
| Array $allow_from = ['127.0.0.1','::1'], | |||
| Optional[Array] $allow_from = undef, | |||
| $requires = undef, | |||
There was a problem hiding this comment.
Could you check this with Optional[Variant[String, Array, Hash]]?
|
@ekohl Good idea about validation. Done! |
|
Since this PR has already many commits and changes, I'll limit it only to |
EmersonPrado
changed the title
|
@EmersonPrado Could you please alter the readme to reflect your changes? |
EmersonPrado
force-pushed
the
MODULES-5385
branch
2 times, most recently
from
4b72037
to
7327efb
Compare
Use "Allow" defaults for "Require" directives for mod::* Include auxilliary template for "Allow" directives for mod::* Use helper templates in mod/status.conf.erb / add "requires" parameter Conflicts: manifests/mod/status.pp Include defaults for "Allow" and "Require" directives in mod::status Conflicts: manifests/mod/status.pp Add comment for Puppet 4.2 in template mod/status.conf.erb Include in template mod/_require.erb parsing of "requires" as string Include in template mod/_require.erb parsing of "requires" as array Include in template mod/_require.erb parsing of "requires" as hash Include in template mod/_require.erb section "Require(Any|All|None)" Allows undef for parameter apache::mod::status::allow_from Add Require <String> context for Apache >= 2.4 in mod::status spec Add missing parameter for Apache 2.4 contexts in mod::status spec test Add function for "Require" directive in mod::status spec test Iterate Require params in Apache 2.4 contexts in mod::status spec test Include empty and "unmanaged" requires param in mod::status spec test Include default case for requires param in mod::status spec test Remove class variable reference in mod::status spec test Change assignment to nil in mod::status spec test Change undef test in mod::status spec test Revert "Change undef test in mod::status spec test" This reverts commit 57ac710. Only change undef test in mod::status spec test Change quoting of control char in mod::status spec test Include in template mod/_require.erb parsing of "requires" as array Include in template mod/_require.erb parsing of "requires" as hash Include in template mod/_require.erb parsing of "requires" with enforce Use each for array parsing in mod::status spec test Correct hash references in mod::status spec test Remove "prints" from "each" iterations in mod::status spec test Split "each" one-liners in mod::status spec test Use symbols in hash keys in mod::status spec test Include "print" again in function returns in mod::status spec test Use map+join to parse arrays in mod::status spec test Correct indentations in helper template for apache 2.4 Include type validation for ...mod::status::requires Align parameter indentation in ...mod::status Document parameter "requires" in ...mod::status Correct parameter description in mod::status class Include in README parameter mod::status::requires Add code tags in parameter mod::status::requires description in README Include array/hash doc refs in mod::status::requires description in README
EmersonPrado
force-pushed
the
MODULES-5385
branch
from
7327efb
to
ee02e96
Compare
|
@david22swan Done. Also rebased to master. Got some failures, but I think they're unrelated. |
|
Yeah, those fails are related to a separate issue. |
cegeka-jenkins
pushed a commit
to cegeka/puppet-apache
that referenced
this pull request
Jul 15, 2020
[Modules 5385] Include support for Apache 2.4 mod_authz_host directives in apache::mod::status
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.
In the current state, creates helper templates
mod/_allowandmod/_requirewith, respectively, Apache 2.2 and 2.4 host authorization logic. These aim to be used by various templates inmod/. Then, templatemod/status.conf.erbis modified to use one of these helper templates depending on Apache version.The
_requirehelper template implements "Require" directives from the parameterrequiresprovided by the calling class. If this isundef, then uses variablerequires_defaults, also provided by the calling class. In order not to break existing systems, ifrequires == undefbutallow_fromis defined, uses the latter and issue a deprecation warning.requiresparameter can be either of:undefip <list>,host <list>,not <something>, etc.)requires- Array of strings (same rule as standalone array)enforce(optional) - Either of "Any|All|None" for<Require*></Require*>blockTested on RHEL 6 and 7 and Debian 7 and 8, but only in Puppet 3 (unfortunately, it's what I have here for the moment)
Test specs were not updated yet