Conversation
0769ae8 to
e38d9c6
Compare
smatting
reviewed
Jul 16, 2025
Comment on lines
+200
to
+202
| zone {{ $name }} 64k; # needed for dynamic DNS updates | ||
| least_conn; | ||
| keepalive 32; |
Contributor
There was a problem hiding this comment.
where do these settings come from?
Member
Author
There was a problem hiding this comment.
They are kept from before, see https://github.com/wireapp/wire-server/blob/develop/tools/nginz_disco/nginz_disco.sh#L49-L55 which results in current upstream files looking like
upstream cargohold {
least_conn;
keepalive 32;
server 10.100.213.88:8080 max_fails=3 weight=100;
}
upstream galeb.integrations {
least_conn;
keepalive 32;
server 10.100.18.166:8080 max_fails=3 weight=100;
}
The only difference here is the addition of a zone, which according to the docs in https://nginx.org/en/docs/http/ngx_http_upstream_module.html (see 'resolve' keyword) is needed, as
The server group must reside in the shared memory.
siberijah
approved these changes
Jul 16, 2025
… intented behaviour or not
supersven
reviewed
Jul 22, 2025
2 tasks
My attempt to try refactorings on the base branch (instead of messing with it
directly.)
Besides minor cleanups, I'm now using an Attoparsec Parser to identify and drop
upsteam <name> { <code> } blocks (blocks can be nested, thus a simple regex
won't help) and Interpolate Template Haskell templates to generate new upstream
blocks.
supersven
approved these changes
Jul 25, 2025
We still need to drop the existing upstreams to add new (adjusted) ones.
Stop at the first '}' which is seen.
Co-authored-by: Paolo Capriotti <[email protected]>
This file contains hidden or 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
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.
WPB-15302
(but actually hardcoded nginx to 1.26 for some reason! - So this PR also upgrades nginx from 1.26 to 1.28)
Checklist
changelog.d