-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Conversation
Especially interested in technical review on https://github.com/matrix-org/synapse/blob/neilj/improved-delegation-doc-2/docs/federate.md#dns-srv-delegation |
Codecov Report
@@ Coverage Diff @@
## master #4832 +/- ##
==========================================
- Coverage 75.07% 74.56% -0.52%
==========================================
Files 340 340
Lines 34882 34882
Branches 5714 5714
==========================================
- Hits 26188 26009 -179
- Misses 7082 7263 +181
+ Partials 1612 1610 -2 |
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.
Mostly me being picky, lgtm otherwise
docs/federate.md
Outdated
|
||
For a more flexible configuration, you can have ``server_name`` | ||
resources (ie: ``@user:example.com``) served by a different host and | ||
port (ie: ``synapse.example.com:443``). There are 2 ways to do this: |
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.
Maybe mention somewhere around here that both ways are described more in-depth in dedicated sections below? This section ending with "If all goes well, you should be able to connect to your server with a client and then join a room via federation" would make me think that I should have delegation working by reaching this point of the documentation.
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.
I reworded
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 we mention somewhere that .well-known doesn't work for synapse 0.34 / current sydent / current scalar / current dendrite so you might want to use a SRV record on the origin domain as well as a .well-known?
@@ -211,100 +162,19 @@ versions of synapse. | |||
|
|||
.. _UPGRADE.rst: UPGRADE.rst | |||
|
|||
.. _federation: |
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.
I've a suspicion this anchor will be used somewhere. It would probably be a good idea to keep it (maybe at the "installation" section).
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.
Nods
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.
I can't see where you've moved this to?
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.
oversight, added back in.
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.
sorry, pressed go too soon before.
I have lots of comments here, but I am conscious that we must not let "perfect" become the enemy of "good" and it might be better to get something out sooner rather than later.
(On a related note: it might be best to PR this against master so that we don't have to wait for a release. That probably means doing a git rebase.)
docs/federate.md
Outdated
"m.server": "synapse.example.com:443" | ||
} | ||
|
||
This delegation method allows a full delegation contrary to the DNS SRV |
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.
I think this paragraph needs a rethink, but I'm not quite sure what it should look like.
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.
Can you explain your concerns?
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.
Addressed our of band and changes committed - wanted to ensure that the methods were considered 'different' rather than one being preferable to another.
a6506e9
to
3558ea1
Compare
Signed-off-by: Valentin Lab <[email protected]>
Co-Authored-By: neilisfragile <[email protected]>
3558ea1
to
400fc11
Compare
INSTALL.md
Outdated
@@ -348,6 +349,26 @@ https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/misc/matrix- | |||
|
|||
Once you have installed synapse as above, you will need to configure it. | |||
|
|||
|
|||
## Setting your server_name |
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.
The instructions above talk about generating the config and setting the server_name, so this is too late.
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.
basically it feels like this section isn't adding anything here. One idea would be to have a section which explains what the server_name does, but instructions here on how you change this one configuration option don't seem to be very helpful.
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.
Agreed, it shouldn't be here - have deleted since it doesn't add much over the config at the beginning of the file
INSTALL.md
Outdated
You can configure your homeserver to use ``<yourdomain.com>`` as the domain in | ||
its user-ids, by setting ``server_name`` on the command line: | ||
|
||
python -m synapse.app.homeserver \ |
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 only valid when installing from source - the packaged installations generally have different ways of doing things.
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.
Agreed, deleted
INSTALL.md
Outdated
--server-name <yourdomain.com> \ | ||
--config-path homeserver.yaml \ | ||
--generate-config | ||
python -m synapse.app.homeserver --config-path homeserver.yaml |
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.
you almost certainly don't want to do this here.
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.
Deleted
@@ -211,100 +162,19 @@ versions of synapse. | |||
|
|||
.. _UPGRADE.rst: UPGRADE.rst | |||
|
|||
.. _federation: |
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.
I can't see where you've moved this to?
docs/federate.md
Outdated
Note that you'll have to modify this URL to replace ``DOMAIN`` with your | ||
``server_name``. Hitting the URL directly provides extra detail. | ||
|
||
For more details the see the [Server to Server Spec](https://matrix.org/docs/spec/server_server/r0.1.1.html#resolving-server-names). |
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 a bit of a funny place for this.
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.
Removed
Co-Authored-By: neilisfragile <[email protected]>
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.
sorry just a few nits left
Co-Authored-By: neilisfragile <[email protected]>
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.
lgtm otherwise!
docs/federate.md
Outdated
following methods allow you retain a ```server_name``` of ```example.com`` | ||
while providing a different server and port for ``*:example.com`` resources | ||
following methods allow you retain a `server_name` of `example.com` | ||
so that your user IDs, room aliases, etc continue to look like `*:example.com`, whilst having your federation traffic routed to a different server. | ||
such user ids and room aliases. |
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.
orphaned sentence
docs/federate.md
Outdated
following methods allow you retain a ```server_name``` of ```example.com`` | ||
while providing a different server and port for ``*:example.com`` resources | ||
following methods allow you retain a `server_name` of `example.com` | ||
so that your user IDs, room aliases, etc continue to look like `*:example.com`, whilst having your federation traffic routed to a different server. |
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.
please wrap
@@ -77,7 +77,7 @@ To use this delegation method, you need to have write access to your | |||
``example.com`` DNS zone). | |||
|
|||
This method requires the target server to provide a | |||
valid SSL certificate identifying it as the original ``server_name`` | |||
valid TLS certificate for the original ``server_name``. | |||
domain zone. |
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.
orphaned
Improved federation configuration docs. Specifically detailing .well-known and SRV based delegation methods. Inspiration Valentin Lab <[email protected]> for #4781
Based from #4781