Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Combine nginx federation server blocks #7823

Merged
merged 3 commits into from
Jul 16, 2020
Merged

Conversation

lfaraone
Copy link
Contributor

@lfaraone lfaraone commented Jul 12, 2020

I'm pretty sure there's no technical reason these have to be distinct server blocks, so collapse into one and go with the more terse location block.

Signed-off-by: Luke W Faraone luke@faraone.cc

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. — NA, docs change
  • Pull request includes a sign off
  • Code style is correct (run the linters)

I'm pretty sure there's no technical reason these have to be distinct server blocks, so collapse into one and go with the more terse location block.

Signed-off-by: Luke W Faraone <luke@faraone.cc>
@clokep clokep requested a review from a team July 13, 2020 17:03
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks sensible.

docs/reverse_proxy.md Outdated Show resolved Hide resolved
docs/reverse_proxy.md Outdated Show resolved Hide resolved
@richvdh richvdh added the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Jul 14, 2020
lfaraone and others added 2 commits July 16, 2020 02:08
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
@richvdh richvdh removed the X-Awaiting-Changes A contributed PR which needs changes and re-review before it can be merged label Jul 16, 2020
@richvdh richvdh self-requested a review July 16, 2020 08:50
@richvdh richvdh merged commit b0f031f into matrix-org:develop Jul 16, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants