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

Add additional config variables with default values (update of #693) #881

Merged
merged 2 commits into from
Sep 29, 2016
Merged

Add additional config variables with default values (update of #693) #881

merged 2 commits into from
Sep 29, 2016

Conversation

wyardley
Copy link
Collaborator

This is a rework of @victorgp's #693 that rebases against current master, and adds tests for the new parameters (the two reasons that PR seems to have been stalled).

I also removed what appear to be a few duplicate tests (let me know if I'm wrong), and realigned dashes in one section of the docs, though mostly tried not to change too much formatting.

I squashed his and my commits, though left attribution for @victorgp's original commit. I don't think I can commit back to the PR since I'm not in the org, but let me know if that's the preferred way to do it (vs. submitting a new PR).

I tried to follow the existing conventions, but It would be great if someone could review my changes to the tests, as well as review the formatting and ordering of directives within nginx.conf.

Victor Garcia and others added 2 commits September 22, 2016 11:58
…rror pages in vhosts, supporting proxy_http_version within locations
@wyardley wyardley changed the title https://github.com/voxpupuli/puppet-nginx/pull/693 Add additional config variables with default values (update of #693) Sep 28, 2016
@bastelfreak bastelfreak merged commit 050a4e1 into voxpupuli:master Sep 29, 2016
@wyardley
Copy link
Collaborator Author

$error_pages should have defaulted to 'undef' instead of {}.
otherwise, since the template had
<% if @error_pages -%> instead of <% unless @error_pages.empty? -%>
the template would print extra lines even if no error pages were defined. I'm updating the fix for this in #888, even though it's not directly related.

@wyardley wyardley deleted the victorgp-master branch October 18, 2016 04:26
@wyardley
Copy link
Collaborator Author

@pschichtel: We have a few PRs in progress that should go out first, but shooting to cut a Forge release pretty soon. It'll be a big one, with a few breaking changes.

Hoping to get this out within the next week or so.

@pschichtel
Copy link

Cool, thanks for the update!

cegeka-jenkins pushed a commit to cegeka/puppet-nginx that referenced this pull request Sep 13, 2019
Add additional config variables with default values (update of voxpupuli#693)
Rubueno pushed a commit to Rubueno/puppet-nginx that referenced this pull request Oct 19, 2020
Add additional config variables with default values (update of voxpupuli#693)
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.

3 participants