Add simple <Limit> support + ProxyAddHeaders #1427
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
|
@costela this looks good! Due to other PRs merged before, this will need a rebase. Thanks! |
added 3 commits
April 15, 2016 10:12
In order to allow "require" statements inside the <Limit> blocks without introducing code duplication, the template for "require" handling has beenrefactored into a subtemplate of its own. This subtemplate accesses the current block being processed (be it a <Directory> or <Limit>) (ab)using a scope variable _template_scope, which is in turn a hash with a single variable :item, to workaround puppet's "thou shall not reset variables".
|
@bmjen done. |
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.
The main commit in this PR introduces minimal support for the block inside blocks.
To do this, the template code handling "Require" directives has been refactored to a template of its own to avoid code duplication. This new template in turn then gets included in the main _directories.erb template, both directly inside the block and also inside each block.
Additionally, this PR also includes the relatively straightforward support for the ProxyAddHeaders directive.