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

Add information about .well-known to Debian installation. #7227

Merged
merged 7 commits into from
Apr 6, 2020
Merged

Add information about .well-known to Debian installation. #7227

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d36f0c
Add information about well-known to Debian installation.
clokep Apr 6, 2020
d5192d2
Update Debian changelog.
clokep Apr 6, 2020
664cfef
Update the pot file using debconf-updatepo.
clokep Apr 6, 2020
affb6c2
Clarify the server-name configuraiton and point to the delegation docs.
clokep Apr 6, 2020
568b144
Remove changelog entry.
clokep Apr 6, 2020
e978a57
Re-run debconf-updatepo.
clokep Apr 6, 2020
8b94e89
Suggestion from review.
clokep Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7227.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update the Debian installation to include information about .well-known in addition to DNS SRV.
clokep marked this conversation as resolved.
Show resolved Hide resolved
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium

* Add information about .well-known files to Debian installation scripts.

-- Patrick Cloke <patrickc@matrix.org> Mon, 06 Apr 2020 10:10:38 -0400

matrix-synapse-py3 (1.12.3) stable; urgency=medium

[ Richard van der Hoff ]
Expand Down
11 changes: 6 additions & 5 deletions debian/po/templates.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the matrix-synapse package.
# This file is distributed under the same license as the matrix-synapse-py3 package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: matrix-synapse\n"
"Report-Msgid-Bugs-To: matrix-synapse@packages.debian.org\n"
"POT-Creation-Date: 2017-02-21 07:51+0000\n"
"Project-Id-Version: matrix-synapse-py3\n"
"Report-Msgid-Bugs-To: matrix-synapse-py3@packages.debian.org\n"
"POT-Creation-Date: 2020-04-06 11:58-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -28,7 +28,8 @@ msgstr ""
#: ../templates:1001
msgid ""
"The name that this homeserver will appear as, to clients and other servers "
"via federation. This name should match the SRV record published in DNS."
"via federation. This name should match the \"m.server\" entry published in "
"the .well-known/matrix file or the SRV record published in DNS."
msgstr ""

#. Type: boolean
Expand Down
3 changes: 2 additions & 1 deletion debian/templates
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ Template: matrix-synapse/server-name
Type: string
_Description: Name of the server:
The name that this homeserver will appear as, to clients and other
servers via federation. This name should match the SRV record
servers via federation. This name should match the "m.server" entry
clokep marked this conversation as resolved.
Show resolved Hide resolved
clokep marked this conversation as resolved.
Show resolved Hide resolved
published in the .well-known/matrix file or the SRV record
published in DNS.

Template: matrix-synapse/report-stats
Expand Down