Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow location_allow / location_deny as well in location blocks #923

Merged
merged 1 commit into from
Oct 17, 2016
Merged

Allow location_allow / location_deny as well in location blocks #923

merged 1 commit into from
Oct 17, 2016

Conversation

wyardley
Copy link
Collaborator

See #741
I did not add any additional tests here, if anyone has a suggestion of a test that should be added, I can add one.
This also simplifies the syntax a little, will need to verify that the changes work as I expect with all Puppet versions.

@wyardley
Copy link
Collaborator Author

wyardley commented Oct 12, 2016

Also add $try_files to allowed directives... maybe we should just consider dropping the sanity check here. h/t to @vladpanainte already handled in #834, just fixed and re-ordered the warning message.

Will try and figure out if there is any more testing I can do for this beyond https://github.com/voxpupuli/puppet-nginx/blob/master/spec/defines/resource_location_spec.rb#L823

@wyardley wyardley changed the title Allow location_allow / location_deny as well in location blocks Allow location_allow / location_deny (and try_files) as well in location blocks Oct 12, 2016
@wyardley wyardley changed the title Allow location_allow / location_deny (and try_files) as well in location blocks Allow location_allow / location_deny as well in location blocks Oct 12, 2016
@jyaworski
Copy link
Member

Please rebase.

…on blocks when other attributes aren't present (issue #741, replaces PR #596, h/t to vladpanainte)

add $try_files as well
@wyardley
Copy link
Collaborator Author

@jyaworski: this was current but had conflicts due to some of my other merged commits. Rebased.

@jyaworski jyaworski merged commit 9ad9643 into voxpupuli:master Oct 17, 2016
cegeka-jenkins pushed a commit to cegeka/puppet-nginx that referenced this pull request Sep 13, 2019
…tion

Allow location_allow / location_deny as well in location blocks
Rubueno pushed a commit to Rubueno/puppet-nginx that referenced this pull request Oct 19, 2020
…tion

Allow location_allow / location_deny as well in location blocks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants