Skip to content

Conversation

@davidtaylorhq
Copy link
Member

@davidtaylorhq davidtaylorhq commented Feb 4, 2025

discourse/discourse@649505d added some new content between listen 80; and gzip on;, which broke these replacements.

This commit reorders & updates the replacements so that they should work reliably with versions of core before and after that change.

  • Move the /server.+{/ replacement to the end, so that it doesn't introduce a duplicate listen 80; which will get in the way of the other replacements
  • Update the listen 80; gzip on; replacement to just look for listen 80;
  • Update the listen 80;\s+listen \[::\]:80; gzip onl replacement to just listen 80;\s+listen \[::\]:80;
  • Swap those two around, so that only one of them can ever run

discourse/discourse@649505d added some new content between `listen 80;` and `gzip on;`, which broke these replacements.

This commit reorders & updates the replacements so that they should work reliably with versions of core before and after that change.
@davidtaylorhq davidtaylorhq merged commit efd6bc8 into main Feb 4, 2025
3 of 5 checks passed
@davidtaylorhq davidtaylorhq deleted the fix-ssl-template branch February 4, 2025 20:01
@Firefishy
Copy link
Contributor

Firefishy commented Feb 7, 2025

The final server block listen 80; used for the redirect isn't enabled for IPv6 regardless of enabling web.ssl.template.yml
I'm don't see an issue just unconditionally turning on IPv6 listening for at least this block.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants