Aggregated some PR & tested & simple bug fix & add new option #120
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
This is so the paremter ordering in the configuration is stable. It also force the :allow key (if it exists) to be first in the sort ordering. It would probably be better to change `$vhost_cfg_append` into an array of one key hashes but would require a public API change.
| <%# make sure that allow comes before deny by forcing the allow key (if it -%> | ||
| <%# exists) to be first in the output order. The hash keys also need to be -%> | ||
| <%# sorted so that the ordering is stable. -%> | ||
| <% if @vhost_cfg_prepend -%><% vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%> |
There was a problem hiding this comment.
Can you use each_line to keep 1.9 support?
|
hawt! I'll merge after the simple changes with |
|
ok |
… dev Conflicts: manifests/package/redhat.pp templates/vhost/vhost_footer.erb templates/vhost/vhost_header.erb
… dev Conflicts: manifests/params.pp manifests/resource/location.pp manifests/resource/vhost.pp templates/vhost/vhost_header.erb
|
Fixed. |
… dev Conflicts: manifests/config.pp manifests/resource/location.pp
jfryman
pushed a commit
that referenced
this pull request
Sep 16, 2013
Aggregated some PR & tested & simple bug fix & add new option
cegeka-jenkins
pushed a commit
to cegeka/puppet-nginx
that referenced
this pull request
Oct 23, 2017
Aggregated some PR & tested & simple bug fix & add new option
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.
Adding option http_cfg_prepend to class nginx
Merge branch 'sort_vhost_cfg_append'
Merge branch 'user-defined-vhost-logs'
Fix puppet-lint