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

Neilj/improved delegation doc 2 #4832

Merged
merged 18 commits into from
Mar 12, 2019
Merged

Conversation

neilisfragile
Copy link
Contributor

Based from #4781

@neilisfragile neilisfragile changed the base branch from master to develop March 7, 2019 23:08
@neilisfragile neilisfragile requested a review from a team March 7, 2019 23:08
@neilisfragile
Copy link
Contributor Author

@codecov
Copy link

codecov bot commented Mar 7, 2019

Codecov Report

Merging #4832 into master will decrease coverage by 0.51%.
The diff coverage is n/a.

@@            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

Copy link
Contributor

@babolivier babolivier left a 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

README.rst Outdated Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
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:
Copy link
Contributor

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I reworded

docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
@richvdh richvdh mentioned this pull request Mar 8, 2019
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.

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?

INSTALL.md Outdated Show resolved Hide resolved
@@ -211,100 +162,19 @@ versions of synapse.

.. _UPGRADE.rst: UPGRADE.rst

.. _federation:
Copy link
Member

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).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nods

Copy link
Member

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oversight, added back in.

docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
richvdh
richvdh previously requested changes Mar 8, 2019
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.

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 Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated
"m.server": "synapse.example.com:443"
}

This delegation method allows a full delegation contrary to the DNS SRV
Copy link
Member

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.

Copy link
Contributor Author

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?

Copy link
Contributor Author

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.

docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
README.rst Outdated Show resolved Hide resolved
@neilisfragile neilisfragile force-pushed the neilj/improved-delegation-doc-2 branch from a6506e9 to 3558ea1 Compare March 11, 2019 16:08
@neilisfragile neilisfragile changed the base branch from develop to master March 11, 2019 16:10
@neilisfragile neilisfragile force-pushed the neilj/improved-delegation-doc-2 branch from 3558ea1 to 400fc11 Compare March 11, 2019 16:15
@richvdh richvdh dismissed their stale review March 11, 2019 17:01

fixed

@richvdh richvdh self-requested a review March 11, 2019 17:01
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
Copy link
Member

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.

Copy link
Member

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.

Copy link
Contributor Author

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 \
Copy link
Member

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.

Copy link
Contributor Author

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
Copy link
Member

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.

Copy link
Contributor Author

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:
Copy link
Member

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 Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
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).
Copy link
Member

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed

docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
@richvdh richvdh self-requested a review March 12, 2019 10:24
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.

sorry just a few nits left

README.rst Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
docs/federate.md Outdated Show resolved Hide resolved
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.

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.
Copy link
Member

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.
Copy link
Member

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.
Copy link
Member

Choose a reason for hiding this comment

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

orphaned

@neilisfragile neilisfragile merged commit 8b692bf into master Mar 12, 2019
anoadragon453 pushed a commit that referenced this pull request Mar 13, 2019
Improved federation configuration docs.  Specifically detailing  .well-known and SRV based delegation methods.

Inspiration Valentin Lab <[email protected]> for #4781
anoadragon453 added a commit that referenced this pull request Mar 13, 2019
…s_use_fullchain

* 'develop' of github.com:matrix-org/synapse:
  fix orphaned sentence
  Neilj/improved delegation doc 2 (#4832)
  Add zwsp in bug report template (#4811)
@neilisfragile neilisfragile deleted the neilj/improved-delegation-doc-2 branch March 30, 2019 20:57
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.

4 participants