-
-
Notifications
You must be signed in to change notification settings - Fork 883
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 option http_cfg_prepend #870
Conversation
Hi, thanks for the patch. Are our tests generally broken? What's the use case here? Is the append option insufficient? In any case, the commits need squashing. |
Hi
Yes
I'm have a trouble sort option in http_cfg_append. include /etc/nginx/customdir/*.conf; And receive syntax nginx error. But need another sequence: limit_conn_zone $server_name zone=perserver:100m;
Done. |
@@ -245,6 +246,7 @@ | |||
fastcgi_cache_use_stale => $fastcgi_cache_use_stale, | |||
gzip => $gzip, | |||
http_access_log => $http_access_log, | |||
http_cfg_prepend => $http_cfg_prepend, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is causing the Travis tests to fail, because the =>
is not aligned with the rest. Puppet Lint is running in Travis and checks for this.
Sorry, fixed |
@@ -36,6 +36,14 @@ events { | |||
} | |||
|
|||
http { | |||
<% if @http_cfg_append -%> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be checking for http_cfg_prepend
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @3flex. Now that this is fix, would you give this a thumbs up? Because if so, I'm inclined to squash-merge this as is now. |
If there's a valid use case, I say go ahead and merge. I have a personal issue with all the append/prepend parameters throughout the module, but until something is done about #538 there's not really a better alternative. That's a big job though. One other possibility is to stop sorting the directives in the templates like we have been, but apparently even on Ruby 1.9.3 there were issues in the past with non-stable ordering, I think Puppet itself might reorder sometimes and makes no guarantees about that unfortunately. That said, 👍 from me! |
Great, thanks for the summary. Thanks to @abraham1901 for the contribution! |
Add http_cfg_prepend option
Add http_cfg_prepend option
Add http_cfg_prepend option
Add option http_cfg_prepend