Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement MSC 1929 Homeserver Admin Contact #1931

Merged
merged 4 commits into from
Jul 18, 2022

Conversation

teutat3s
Copy link
Contributor

@teutat3s
Copy link
Contributor Author

Idea from moanos in the matrix room for vars.yml format:

matrix_homeserver_admin_contacts:
  - moanos:
    matrix_id: @moanos:hyteck.de
    email: ...

@teutat3s teutat3s requested a review from spantaleev July 17, 2022 14:11
@teutat3s
Copy link
Contributor Author

Thank you for the constructive feedback @spantaleev - I tried to address your suggestions in the latest commit.

@teutat3s teutat3s force-pushed the feature/msc-1929 branch 2 times, most recently from 7845be3 to 91cca1b Compare July 18, 2022 09:12
@spantaleev spantaleev merged commit 018ca75 into spantaleev:master Jul 18, 2022
spantaleev added a commit that referenced this pull request Jul 18, 2022
Related to #1931

`|to_json` already adds the surrounding double-quotes for the string, so
adding them explicitly means we've got a double-quotes problem.
spantaleev added a commit that referenced this pull request Jul 18, 2022
Related to #1931

This does 2 things:

- it fixes the syntax for `matrix_id`. Starting strings with `@` is
  invalid YAML, so such strings need to be wrapped in single or double
  quotes
- it makes use of the `matrix_domain` variable instead of hardcoding the
  domain name. This should be more and mistake-proof (typos or people
  mistaking their domain - matrix. vs base domain)
@spantaleev
Copy link
Owner

Thanks! 👍

I've merged it, but had to do some post-merge fixes:

  • the YAML syntax for matrix_homeserver_admin_contacts did not work for me. See 3f7498d
  • there was a double-quoting issue in /.well-known/matrix/support. See c9e3070

I've also added a variable (matrix_well_known_matrix_support_enabled) that controls whether the /.well-known/matrix/support file gets generated or not. This is inspired by the matrix_well_known_matrix_server_enabled variable we have, which does the same for the /.well-known/matrix/server file.

Because matrix-org/matrix-spec-proposals#1929 is not yet accepted, I've defaulted the new matrix_well_known_matrix_support_enabled variable to false, so that we won't generate the /.well-known/matrix/support file by default. We shouldn't be contaiminating people's servers with files that pertain to unaccepted experimental features. The example in docs/configuring-well-known.md has been updated to mention matrix_well_known_matrix_support_enabled.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature Request] Support for MSC1929: Homeserver Admin Contact and Support page
3 participants