From dee815a7bd5d4d429da4cc38de959a07f8862640 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 39ad3053..c2b8baff 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 252f3dcb9b3b40746ba95ed30f28b7af6dbc9bb7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1ab5593c..14052a92 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -29,6 +29,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -43,6 +48,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 7d8253bf57361547c05b49475ca9d930106b01c8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7817b0cd..97d0e803 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -34,7 +34,7 @@ REQUIREMENTS = { "pydenticon": ["pydenticon"], "ujson": ["ujson"], "blist": ["blist"], - "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], + "pysaml2>=3.0.0,<4.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], } -- cgit v1.2.3 From b3e1f164d3c7f6de3dd3019196f04806a4e758d1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e0b87468..9fd17475 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -23,7 +23,7 @@ import sys from synapse.config._base import ConfigError from synapse.python_dependencies import ( - check_requirements, DEPENDENCY_LINKS + check_requirements ) from synapse.rest import ClientRestResource @@ -85,12 +85,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt-get, run:\n\n" + " apt-get install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": DEPENDENCY_LINKS["matrix-angular-sdk"]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From bec0631e9ed98d9f102c1d0e529a5d02fc764b52 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 9fd17475..b544e67b 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 7cdff55241eb338a3bd8c4977547678b2f86dd00 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 97d0e803..88e9188c 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -22,7 +22,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"], + "pynacl==0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From 00a2a8e8d4a67639ded98a4c715e812401839c87 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sun, 12 Feb 2017 09:54:56 +0100 Subject: Use signedjson.sign instead of syutil.crypto.jsonsign Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Forwarded: yes -- Gbp-Pq: Name 0007-use-signedjson.patch --- contrib/cmdclient/console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index 8bb03ce6..4918fa1a 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -32,7 +32,7 @@ import urlparse import nacl.signing import nacl.encoding -from syutil.crypto.jsonsign import verify_signed_json, SignatureVerifyException +from signedjson.sign import verify_signed_json, SignatureVerifyException CONFIG_JSON = "cmdclient_config.json" -- cgit v1.2.3 From 2e88ba35f733c003c157da7366b4efbced210fad Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From d0773c8ac7b24a55b121b415c3418d8b4df2b073 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 39ad3053..c2b8baff 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From c038cf6fa6b38f4f2670b2498e9d5370a8e0c754 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1ab5593c..14052a92 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -29,6 +29,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -43,6 +48,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From d3bc13084dbafe321bfa90b89c22ae2051316c29 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7817b0cd..97d0e803 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -34,7 +34,7 @@ REQUIREMENTS = { "pydenticon": ["pydenticon"], "ujson": ["ujson"], "blist": ["blist"], - "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], + "pysaml2>=3.0.0,<4.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], } -- cgit v1.2.3 From d2af57b066984e2d890cabd37b9d1422bb9d8db3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e0b87468..9fd17475 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -23,7 +23,7 @@ import sys from synapse.config._base import ConfigError from synapse.python_dependencies import ( - check_requirements, DEPENDENCY_LINKS + check_requirements ) from synapse.rest import ClientRestResource @@ -85,12 +85,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt-get, run:\n\n" + " apt-get install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": DEPENDENCY_LINKS["matrix-angular-sdk"]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From e0356047984daed74bd011b181b53f276441618c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 9fd17475..b544e67b 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 7a9a9e788c239b37991c78cc03de8a95ca47df36 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 97d0e803..88e9188c 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -22,7 +22,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"], + "pynacl==0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From ee55537f53f2cc29db71cd7515d014ed3fa57c7b Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sun, 12 Feb 2017 09:54:56 +0100 Subject: Use signedjson.sign instead of syutil.crypto.jsonsign Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Forwarded: yes -- Gbp-Pq: Name 0007-use-signedjson.patch --- contrib/cmdclient/console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index 8bb03ce6..4918fa1a 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -32,7 +32,7 @@ import urlparse import nacl.signing import nacl.encoding -from syutil.crypto.jsonsign import verify_signed_json, SignatureVerifyException +from signedjson.sign import verify_signed_json, SignatureVerifyException CONFIG_JSON = "cmdclient_config.json" -- cgit v1.2.3 From 10c2c0fa06f972c46dee64730aa2cc70c2f1fa47 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From b492c87550f03d37ed27c0d9ccbdb5758d000b05 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 39ad3053..c2b8baff 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 47fbf77fe9555e0ce132d501aa302b2d9c458aa1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1ab5593c..14052a92 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -29,6 +29,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -43,6 +48,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 9decc49831a0d1e97c27147d11aa0024a8683595 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7817b0cd..97d0e803 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -34,7 +34,7 @@ REQUIREMENTS = { "pydenticon": ["pydenticon"], "ujson": ["ujson"], "blist": ["blist"], - "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], + "pysaml2>=3.0.0,<4.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], } -- cgit v1.2.3 From 7ab9d1180d30a4c4b1b55efdb84cdbab6bb9818c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e0b87468..9fd17475 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -23,7 +23,7 @@ import sys from synapse.config._base import ConfigError from synapse.python_dependencies import ( - check_requirements, DEPENDENCY_LINKS + check_requirements ) from synapse.rest import ClientRestResource @@ -85,12 +85,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt-get, run:\n\n" + " apt-get install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": DEPENDENCY_LINKS["matrix-angular-sdk"]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From f60cf802a3ebffabfd26d7b30ba8a861f15254cc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 9fd17475..b544e67b 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 1fc4ef23427caefaa41a5d9ff6212298e4ffb119 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 97d0e803..88e9188c 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -22,7 +22,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"], + "pynacl==0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From 71ae4d974f000fe5e4f90953b82f48c02542911d Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sun, 12 Feb 2017 09:54:56 +0100 Subject: Use signedjson.sign instead of syutil.crypto.jsonsign Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Forwarded: yes -- Gbp-Pq: Name 0007-use-signedjson.patch --- contrib/cmdclient/console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index 8bb03ce6..4918fa1a 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -32,7 +32,7 @@ import urlparse import nacl.signing import nacl.encoding -from syutil.crypto.jsonsign import verify_signed_json, SignatureVerifyException +from signedjson.sign import verify_signed_json, SignatureVerifyException CONFIG_JSON = "cmdclient_config.json" -- cgit v1.2.3 From cddb66c9534e5f44846694d7f8561e8d772f4805 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 66cfdca3a5d11bbf543d7ef4a2de4905fdb35337 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 39ad3053..c2b8baff 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 3675c1665a400c13f55e77ffd9e110505d71f34a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1ab5593c..14052a92 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -29,6 +29,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -43,6 +48,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 01b6832fe916e83042a1cd7cabe4236941ff6b80 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7817b0cd..97d0e803 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -34,7 +34,7 @@ REQUIREMENTS = { "pydenticon": ["pydenticon"], "ujson": ["ujson"], "blist": ["blist"], - "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], + "pysaml2>=3.0.0,<4.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], } -- cgit v1.2.3 From 367840b85e4730c5bb32a1821a28b92165ad3824 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e0b87468..9fd17475 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -23,7 +23,7 @@ import sys from synapse.config._base import ConfigError from synapse.python_dependencies import ( - check_requirements, DEPENDENCY_LINKS + check_requirements ) from synapse.rest import ClientRestResource @@ -85,12 +85,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt-get, run:\n\n" + " apt-get install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": DEPENDENCY_LINKS["matrix-angular-sdk"]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From b132cd7e9fd23e0144666d6fafb7750b4a78675b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 9fd17475..b544e67b 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From f34b2dcc55688154932afc1501aa02a3b8050d83 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 97d0e803..88e9188c 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -22,7 +22,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"], + "pynacl==0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From df023cec9d96ce1a44d446f51cc14f3ce5749dfe Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Sun, 12 Feb 2017 09:54:56 +0100 Subject: Use signedjson.sign instead of syutil.crypto.jsonsign Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Forwarded: yes -- Gbp-Pq: Name 0007-use-signedjson.patch --- contrib/cmdclient/console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index 8bb03ce6..4918fa1a 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -32,7 +32,7 @@ import urlparse import nacl.signing import nacl.encoding -from syutil.crypto.jsonsign import verify_signed_json, SignatureVerifyException +from signedjson.sign import verify_signed_json, SignatureVerifyException CONFIG_JSON = "cmdclient_config.json" -- cgit v1.2.3 From 53435464d0097343cd0ede3c846d8dcf525952b1 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 6a92b2d437f5deffa3ae70747a5a82a8695f180b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index f408defc..4a40b2a3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From cb00b48f0e45f4e52bccd4ca72f8fa3d0fd2fe13 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fa105bce..cf55a200 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -29,6 +29,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -43,6 +48,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From d2fc859782594d1ebf2c2ef57a45e186676ddeba Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7052333c..93381e05 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -36,7 +36,7 @@ REQUIREMENTS = { "pydenticon": ["pydenticon"], "ujson": ["ujson"], "blist": ["blist"], - "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], + "pysaml2>=3.0.0,<4.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From 7cea9200c57dc5cab6c2298b501175f64bd17b4f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 3adf72e1..61f6f469 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -34,7 +34,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import register_memory_metrics from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ +from synapse.python_dependencies import \ check_requirements from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -75,12 +75,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From dfcfd7ffb2f45d866dbb44e85e68dd70f474e879 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 61f6f469..d21e9f7f 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -147,7 +147,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From e71a7d3aba43a0167b5297d59969ea280705356d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 93381e05..004ddcfd 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -24,7 +24,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl==0.3.0": ["nacl==0.3.0", "nacl.bindings"], + "pynacl==0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From 9f74e5f6c1a25d8eaf502f59299abc31dc75eff3 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From aa5ca54c134906c72356d41fff543ede0fce4352 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 24 Oct 2017 15:05:33 +0100 Subject: Try to not require phonenumbers yet. Gbp-Pq: Name 0009-drop-phonenumbers-dep.patch --- synapse/python_dependencies.py | 1 - synapse/util/msisdn.py | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 004ddcfd..da287c9a 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -39,7 +39,6 @@ REQUIREMENTS = { "pysaml2>=3.0.0,<4.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], - "phonenumbers>=8.2.0": ["phonenumbers"], } CONDITIONAL_REQUIREMENTS = { "web_client": { diff --git a/synapse/util/msisdn.py b/synapse/util/msisdn.py index 607161e7..e76c4b99 100644 --- a/synapse/util/msisdn.py +++ b/synapse/util/msisdn.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import phonenumbers +# import phonenumbers +import re from synapse.api.errors import SynapseError @@ -31,10 +32,4 @@ def phone_number_to_msisdn(country, number): Raises: SynapseError if the number could not be parsed. """ - try: - phoneNumber = phonenumbers.parse(number, country) - except phonenumbers.NumberParseException: - raise SynapseError(400, "Unable to parse phone number") - return phonenumbers.format_number( - phoneNumber, phonenumbers.PhoneNumberFormat.E164 - )[1:] + return re.sub('^00', '', re.sub(' ', '', number)) -- cgit v1.2.3 From e75f33fdaf98ccff89c7be66a6a0f5ac48245b3f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index f408defc..4a40b2a3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From c7b99c639e617276f231dec66132c98ef2bd8d6b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fa105bce..cf55a200 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -29,6 +29,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -43,6 +48,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 55126d407a90ad599b09f90bfe480c42af1ae3eb Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 91179ce5..c8ace894 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -36,7 +36,7 @@ REQUIREMENTS = { "pydenticon": ["pydenticon"], "ujson": ["ujson"], "blist": ["blist"], - "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From 9c3c0e6a68d2551873243c18a0c71d4316c73478 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e477c7ce..4c6ef083 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,7 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import register_memory_metrics from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ +from synapse.python_dependencies import \ check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory @@ -78,12 +78,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 0cd5be2278f3e7aa4e110a6339a914a44adba52e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 4c6ef083..98867b27 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -110,7 +110,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -155,7 +155,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -213,7 +213,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From f41a430a2d08ce9645302f8a199b12e6193e9bba Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c8ace894..24e2cbbf 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -24,7 +24,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From ec8f2a42212a73774b0278356f0abe8e038a6fb1 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 4013e64aaada01411a36809e6d78cb7baeb4f72e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index f408defc..4a40b2a3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From d6dbf119e79d9eba74fab80e0f43e0caeee8df8c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 32b439d2..c16cd3d4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6eda590563a6165fa7e47d0ee4b1440f61c54f29 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 5cabf7da..d074c8da 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -35,7 +35,7 @@ REQUIREMENTS = { "pillow": ["PIL"], "pydenticon": ["pydenticon"], "blist": ["blist"], - "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From 3f54f1971f5f633aea5cc7f0fa77cdd0c0b8c4d2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index a0e465d6..10da056a 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,7 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import register_memory_metrics from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ +from synapse.python_dependencies import \ check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory @@ -79,12 +79,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 0fe3b5bd310f1adae77c313da8a9333bf68f58dc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 10da056a..c31f2eae 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -111,7 +111,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -156,7 +156,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -214,7 +214,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 116e8c5d641508b7e6f6d3cd58e59cb343fa3f38 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d074c8da..ad3e5bae 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -24,7 +24,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From ffb73e5a6e666ba78f562db3f85272d989831155 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From d8828751dd621dd3fd5cf4227fcdb078526092c2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index f408defc..4a40b2a3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 9ab1a9a2ef7f3134ca2a4513bc9e8ea36c7519ea Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 32b439d2..c16cd3d4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 59f691fe8697e400c25cbdae75622f3bcb84797a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 5cabf7da..d074c8da 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -35,7 +35,7 @@ REQUIREMENTS = { "pillow": ["PIL"], "pydenticon": ["pydenticon"], "blist": ["blist"], - "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From 2bcd99d75633b62ad649416a431903ffe1a9568f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index a0e465d6..10da056a 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,7 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import register_memory_metrics from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ +from synapse.python_dependencies import \ check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory @@ -79,12 +79,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 850656a7b893e11b0efd727cbe8b93309c842b08 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 10da056a..c31f2eae 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -111,7 +111,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -156,7 +156,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -214,7 +214,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 277c0ee975de82aaa7803a1a22874de8c493ab10 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d074c8da..ad3e5bae 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -24,7 +24,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], -- cgit v1.2.3 From 1e207f8a2e48434fd831f5a519107463677e6a26 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 8c34978098c595e7a2c7614a7e2ec39838d3d4c2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index f408defc..4a40b2a3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From f860585a2bdecd35a427134986e237510aa975c7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 32b439d2..c16cd3d4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 3839ccdc11e4cc984df1308c2778195ea38502d2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 711cbb6c..13dbbc79 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -52,7 +52,7 @@ REQUIREMENTS = { "pillow": ["PIL"], "pydenticon": ["pydenticon"], "blist": ["blist"], - "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From e236d84daa46cc256874b5b8dd7348fd4a73de55 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index a0e465d6..10da056a 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,7 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import register_memory_metrics from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ +from synapse.python_dependencies import \ check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory @@ -79,12 +79,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From e87e86a682cb6a37f0c77683edf68564efd2a3fc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 10da056a..c31f2eae 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -111,7 +111,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -156,7 +156,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -214,7 +214,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 2638b1b922add09f3a46a7b37e560b1b44dd8e08 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 13dbbc79..fc891824 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -37,7 +37,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], # we break under Twisted 18.4 -- cgit v1.2.3 From aaf2a13e4286064a78f73737e550f5cfe3bd0418 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 2b519603d7fd42a3d839b47082a92f13d3a04e2b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 89ca6d7a..04c7638b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From dc7287ce2cf99d047bd344b056890166aeaf1dfe Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 2ce8d779ad26dff6459bf131227ae5693d5b1481 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 216db4d1..d2e89423 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -51,7 +51,7 @@ REQUIREMENTS = { "pillow": ["PIL"], "pydenticon": ["pydenticon"], "blist": ["blist"], - "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From 6001df8741e073089d6426f2401817430b9a3c64 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 75f40fd5..6eac3591 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,7 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import register_memory_metrics from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ +from synapse.python_dependencies import \ check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory @@ -79,12 +79,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From f18facfd694a7716e4a66e7329e081633cf51aea Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 6eac3591..967a6330 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -111,7 +111,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -158,7 +158,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -216,7 +216,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 48b2bf70f6f463db4214d0567f850451914f4762 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d2e89423..e037e4af 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -37,7 +37,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], -- cgit v1.2.3 From b3e0a15e39f5db8bcb6f7d0d332452c07ccdc0c8 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 64f43fa1133039cb73b3b4d267ce31c86d7eb367 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 89ca6d7a..04c7638b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 40f08bf2598606bf5cc4218c94625992db109384 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From ca0bc324a8a8f4f675e1f1a929c1668945ff0b36 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 216db4d1..d2e89423 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -51,7 +51,7 @@ REQUIREMENTS = { "pillow": ["PIL"], "pydenticon": ["pydenticon"], "blist": ["blist"], - "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From 69739001311c6ffb4edb45576d711ce17d7ab991 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index caccbaa8..f7c51406 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,7 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import register_memory_metrics from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ +from synapse.python_dependencies import \ check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory @@ -79,12 +79,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 8572ebd9c63cbe5fe2fa9b3a0f4ee722df532277 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index f7c51406..f36eefd6 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -111,7 +111,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -158,7 +158,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -225,7 +225,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 9334572b90dd389d1b0d2ef292dbb719b508117c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d2e89423..e037e4af 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -37,7 +37,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], -- cgit v1.2.3 From bb93806246bbdc3950f70b7ed8491992990e644f Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 57bb02d20e84f74393a2643d5c3cddc0687e9df9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 99b35f39..23a90982 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From a1aaa7c9d8a61c405984dde2278e97bacd946a50 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 13284275d8fc2a5d30c0e91664c74b5508944a19 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: saml2 Gbp-Pq: Name 0003-saml2.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 478c4977..9af121ee 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -51,7 +51,7 @@ REQUIREMENTS = { "pillow": ["PIL"], "pydenticon": ["pydenticon"], "blist": ["blist"], - "pysaml2>=3.0.0": ["saml2>=3.0.0"], + "pysaml2>=3.0.0": ["saml2"], "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], -- cgit v1.2.3 From 10d387ec38a5b61a687f745012af3e91b04b2798 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 714f98a3..5dc3287d 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,8 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ - check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -79,12 +78,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 22a33e1587b1d69f7c67997c6f936a9ac1dd9bdd Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 5dc3287d..0caef4ff 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -110,7 +110,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -224,7 +224,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 39006fb7b74bf51925dd786ce818250acb2d13e4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 20 Jun 2016 13:20:37 +0100 Subject: Don't require strict nacl==0.3.0 requirement Gbp-Pq: Name 0006-Don-t-require-strict-nacl-0.3.0-requirement.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 9af121ee..cfa23194 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -37,7 +37,7 @@ REQUIREMENTS = { "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"], "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"], "signedjson>=1.0.0": ["signedjson>=1.0.0"], - "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"], + "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "Twisted>=16.0.0": ["twisted>=16.0.0"], -- cgit v1.2.3 From 8875b61ebb97b7b1e9c3135b14a03c539fb086bb Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 9823855a88fbb9316ab56bdef258685592f7b52d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 99b35f39..23a90982 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 0f97750bf5bce2ec3662a2e8ec43bad5363b2a66 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 007aa5dc1379d5e5e6482d6b7874d2cee3d379cf Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 714f98a3..5dc3287d 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,8 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ - check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -79,12 +78,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 07ecae494f72dcce1063aee3b16712196601c44e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 5dc3287d..0caef4ff 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -110,7 +110,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -224,7 +224,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From b8646d28bae1232374fdf4f13632b87e17e082bf Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 4de271fe61e63ac918730dbaf08acdc1cb357bf6 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 99b35f39..23a90982 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From b53b65b3b3c951ef152b5cb885cf2da54071cbae Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 07b6c8ecd76eac55158a671abf519837ab66e1d5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 714f98a3..5dc3287d 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,8 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ - check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -79,12 +78,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 6781c85b5984ba17e169e5c951a228b8e6369da9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 5dc3287d..0caef4ff 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -110,7 +110,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -224,7 +224,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 086ecee5a2791ee634a0201f613ae2416a28048b Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 2c98154e5570a10f3aebfa2aa710849637dedf22 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 99b35f39..23a90982 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From dce7db4407518a318b7c380963dbd3152fc4e8c4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 478fd759b688a3f10af97bf9e0bf5ff9d2115336 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 714f98a3..5dc3287d 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,8 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ - check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -79,12 +78,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 26c027af281758034e212b1113d68614a533c7e5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 5dc3287d..0caef4ff 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -110,7 +110,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -224,7 +224,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 81daf8904b1a36cc6bfd170a5c1c6d3b357f3189 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From bb46389b4670b42dc0c4a80a36d2aedc92a433f1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 99b35f39..23a90982 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From aeaee29e7b523cbb71eb6c238c40cb22b700a340 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c3bff9b1c5d9c389a3f4d2a0557efbeadb54e539 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 714f98a3..5dc3287d 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,8 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ - check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -79,12 +78,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 1e8ecf35ba9ce14d71fdb9eb32b4b75f6f2c0c27 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 5dc3287d..0caef4ff 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -110,7 +110,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -224,7 +224,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 9be77e16867f3a6d7e8ed5e57e7e9e712dbe78a7 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 7ee80cecb2b1e1e1717bf422cbb9a1ab0afc1f6d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 61a20a10..50a2d164 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8 +sitepackages = True [testenv] deps = -- cgit v1.2.3 From aa9447fe28231621200f4411d6754ebb29cdde4a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index b748ed2b..9c9cbe46 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -31,6 +31,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -45,6 +50,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From a793738be4f763267dffa5206941d590e657cfac Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index ae5fc751..70637853 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -36,8 +36,7 @@ from synapse.http.server import RootRedirect from synapse.http.site import SynapseSite from synapse.metrics import RegistryProxy from synapse.metrics.resource import METRICS_PREFIX, MetricsResource -from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ - check_requirements +from synapse.python_dependencies import check_requirements from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource @@ -79,12 +78,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From d815718e34a6702e462192801aaf43ce57a813d2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 70637853..7dc1cf12 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -110,7 +110,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -157,7 +157,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -224,7 +224,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From b2a16e13692870a02382da506c01b72d2504a9d1 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 4ee479e56181da4f5abc57eec297a4ecb676a126 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index ed26644b..64b09fda 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 5e5513de2a9dc6f1e0517e4dc67ee138963ee60e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 59f20331283da456f55aadbb4eda1da342cd46b2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 14e6dca5..737cb018 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -86,12 +86,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From c8c330f19391fa167b3dcee82d077876efa2feef Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 737cb018..4e596430 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -118,7 +118,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -165,7 +165,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -232,7 +232,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From ceb533b34ece2e60d4b6686bf14101625ed2d1be Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 5ddc5701f4a277ab79cae73b3b4fe6f43d129f33 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index ed26644b..64b09fda 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [testenv] deps = -- cgit v1.2.3 From f3d8fa66f40962d9048b815f7ec254eb8467182f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From a8b21c826e287349516459d1478b603af7c1597c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 14e6dca5..737cb018 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -86,12 +86,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 9474930b3140bd90881dba40ab95456c3b71e43f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 737cb018..4e596430 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -118,7 +118,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -165,7 +165,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -232,7 +232,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From c18ad4ba7f33e75e1b3fb795626489c055564e60 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From d5bec7190d44b4f74b37a350b6112229f66c62e2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index ed26644b..64b09fda 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [testenv] deps = -- cgit v1.2.3 From dabbd89f3a682dd0d71c91a900c326389478abbb Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c8deb8b0becd3a284b5acd82d6283bb06e88aaf4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index fba51c26..dfcc7b12 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -91,12 +91,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From dad870836cd4a1662e56c9f754cb0a53fb531b52 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index dfcc7b12..e7bf7d67 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -123,7 +123,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -170,7 +170,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -237,7 +237,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 6e4dc4da3f8df9a430a29dc5db5978cad1f77752 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 845622abe3d216b73092a823aa451d51604a3449 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index ed26644b..64b09fda 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 9701622c6cf9f49632d3e669b867bba540c5f093 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From fb461a92dda5ddc2a76f3d3c66e9ca9148274923 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index fba51c26..dfcc7b12 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -91,12 +91,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From f4ef643c7dd50c86a3a7b1cba1bf10acc0c2a47f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index dfcc7b12..e7bf7d67 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -123,7 +123,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -170,7 +170,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -237,7 +237,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From a73e1d588a89dfc08b25a31bc167d58f3c4bbacd Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From b426e496ae2da1d66d1674556b94cd20fa0c3dc3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index ed26644b..64b09fda 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [testenv] deps = -- cgit v1.2.3 From 7dc8e408315b9ec9ee64a65a1e7531b5dd35d8f7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From cf1501bf9a75581f983f3081f55c8e63f4c08589 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index fba51c26..dfcc7b12 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -91,12 +91,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 0c83a0067e6425c6c2a5b53f956b4d6953f4260e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index dfcc7b12..e7bf7d67 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -123,7 +123,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -170,7 +170,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -237,7 +237,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 05e573385b9dd6e39a4b867044d07242ee8bafd3 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 21 Feb 2017 17:28:35 +0100 Subject: We don't ship recaptcha, don't try to load it. Gbp-Pq: Name 0008-dont-ship-recaptcha.patch --- synapse/static/client/register/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/static/client/register/index.html b/synapse/static/client/register/index.html index 600b3ee4..b4db179a 100644 --- a/synapse/static/client/register/index.html +++ b/synapse/static/client/register/index.html @@ -4,7 +4,7 @@ - + -- cgit v1.2.3 From 94158f3f7d49ee0c3f9190231767de5d1c2a81a3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 085f4389..470737f0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [base] deps = -- cgit v1.2.3 From ab12dba69945b4136739a6643995b6c38c5468c8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 2067c1a0556fb765f893fa65d669b4c22054ba74 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 005921dc..264d060a 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -91,12 +91,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 53c56e6cd84bc887b1e4f40a7e24b9b6e01b80ac Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 264d060a..fd6429fb 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -123,7 +123,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -170,7 +170,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -237,7 +237,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 36d88b2ac9e3927c0176a25b425534d4bb577de0 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 085f4389..470737f0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [base] deps = -- cgit v1.2.3 From 9bb53c2269c7ffc3d51aaa003b602cb18b19d454 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 5f78d38a86a6c902bc4f99492414c179b9bf8ae5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 005921dc..264d060a 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -91,12 +91,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From b3c85c0c11dbf7f45b6cbf21e8c7e1a5b6f2122c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 264d060a..fd6429fb 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -123,7 +123,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -170,7 +170,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -237,7 +237,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 9f68584e2238feac200c82b0b10d9eda91ceeac3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 085f4389..470737f0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [base] deps = -- cgit v1.2.3 From 64a650a252fb6e5611a744b3b2168ee3f9430269 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From b098640844eab73e8a62cee4115977fbd1607641 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 005921dc..264d060a 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -91,12 +91,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 468542846a2c917533867d0d44d4c42650cd1abc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 264d060a..fd6429fb 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -123,7 +123,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -170,7 +170,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -237,7 +237,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From bb99f0ed1cfec075a9005fbdf043c41dd510d4a7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: tox Gbp-Pq: Name 0001-tox.patch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 085f4389..470737f0 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = packaging, py27, py36, pep8, check_isort +sitepackages = True [base] deps = -- cgit v1.2.3 From ddc9618b5493d933918f479e7425f9a7df420ba5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 3d2e90dd..2d103487 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 466846a67423168fe767eef5432d1b8c68a1c65d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 3eb5b663..22c0f81c 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -91,12 +91,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 31f123d55474cd72178d08b1e3662851bfbc6514 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 22c0f81c..9ae215d6 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -125,7 +125,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -172,7 +172,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -239,7 +239,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 3e8dedd18a3be2d94ad9f25aa4d1f51b4ac609e0 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/app/__init__.py | 4 ++-- synapse/config/jwt.py | 2 +- synapse/config/repository.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index 3b6b9368..98a6f954 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -25,8 +25,8 @@ try: except python_dependencies.MissingRequirementError as e: message = "\n".join([ "Missing Requirement: %s" % (e.message,), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + "To install, try:", + " sudo apt install python-%s" % (e.dependency,), "", ]) sys.stderr.writelines(message) diff --git a/synapse/config/jwt.py b/synapse/config/jwt.py index 51e7f7e0..6d3ee06b 100644 --- a/synapse/config/jwt.py +++ b/synapse/config/jwt.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index fc909c1f..a704eeb2 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python-lxml """ ) -- cgit v1.2.3 From 8b8bc61324ae9f3ec666be7b12ffdb09b64e216b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 14dae65e..2ab55da3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From e5a8ce609d1af6f2be54257025b86938c5e481f9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 593e1e75..b1b68815 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -92,12 +92,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 2ee332837b14f6151fba1b13f0ca870c71b409d8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b1b68815..5fea7efb 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -126,7 +126,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -173,7 +173,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -240,7 +240,7 @@ class SynapseHomeServer(HomeServer): SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self), }) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 075529b5670ce5b9f9bcbb569a44bca4f89f890c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/app/__init__.py | 4 ++-- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index c3afcc57..a4911e65 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -25,8 +25,8 @@ try: except python_dependencies.MissingRequirementError as e: message = "\n".join([ "Missing Requirement: %s" % (str(e),), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + "To install, try:", + " sudo apt install python-%s" % (e.dependency,), "", ]) sys.stderr.writelines(message) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..6d3ee06b 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 06c62ab6..0ccbc8c9 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python-lxml """ ) -- cgit v1.2.3 From c9c1d649461c9cf46f1dd36218bcfd59342db57d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 14dae65e..2ab55da3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6177f00c327a64658d4ac8454acb874b24a1c501 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: webclient-instructions Gbp-Pq: Name 0004-webclient-instructions.patch --- synapse/app/homeserver.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 415374a2..ee405c11 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -90,12 +90,11 @@ def build_resource_for_web_client(hs): "Please either install the matrix-angular-sdk or configure\n" "the location of the source to serve via the configuration\n" "option `web_client_location`\n\n" - "To install the `matrix-angular-sdk` via pip, run:\n\n" - " pip install '%(dep)s'\n" + "To install the `matrix-angular-sdk` via apt, run:\n\n" + " apt install matrix-synapse-angular-client\n" "\n" "You can also disable hosting of the webclient via the\n" "configuration option `web_client`\n" - % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]} ) syweb_path = os.path.dirname(syweb.__file__) webclient_path = os.path.join(syweb_path, "webclient") -- cgit v1.2.3 From 16c4d4f94753daf70e17ffaaed93fcc3b3146893 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index ee405c11..8af45335 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -124,7 +124,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -171,7 +171,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -235,7 +235,7 @@ class SynapseHomeServer(HomeServer): if name in ["keys", "federation"]: resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self) - if name == "webclient": + if name == "webclient" and config.web_client: resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self) if name == "metrics" and self.get_config().enable_metrics: -- cgit v1.2.3 From 8a7fdc35313bb2a94a8b236e58e84f01d3a1b552 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/app/__init__.py | 4 ++-- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index c3afcc57..a4911e65 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -25,8 +25,8 @@ try: except python_dependencies.MissingRequirementError as e: message = "\n".join([ "Missing Requirement: %s" % (str(e),), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + "To install, try:", + " sudo apt install python-%s" % (e.dependency,), "", ]) sys.stderr.writelines(message) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..6d3ee06b 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 06c62ab6..0ccbc8c9 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python-lxml """ ) -- cgit v1.2.3 From 49cc9cd1c8c7e0c01b0cb7b8ea00d3dcbfc4804d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 14dae65e..2ab55da3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 5ee74912d4fe365ce058d1b6bda3ec73c663852f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 13:24:51 +0100 Subject: Honour config.web_client Gbp-Pq: Name 0005-Honour-config.web_client.patch --- synapse/app/homeserver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 6169bf09..06c9393b 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -95,7 +95,7 @@ class SynapseHomeServer(HomeServer): for res in listener_config["resources"]: for name in res["names"]: resources.update(self._configure_named_resource( - name, res.get("compress", False), + config, name, res.get("compress", False), )) additional_resources = listener_config.get("additional_resources", {}) @@ -145,7 +145,7 @@ class SynapseHomeServer(HomeServer): ) logger.info("Synapse now listening on port %d", port) - def _configure_named_resource(self, name, compress=False): + def _configure_named_resource(self, config, name, compress=False): """Build a resource map for a named resource Args: @@ -209,7 +209,7 @@ class SynapseHomeServer(HomeServer): if name in ["keys", "federation"]: resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self) - if name == "webclient": + if name == "webclient" and config.web_client: webclient_path = self.get_config().web_client_location if webclient_path is None: -- cgit v1.2.3 From ab3ef73fb48e0bb6e279662a92f8bda6d53a242c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/app/__init__.py | 4 ++-- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index c3afcc57..05075566 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -25,8 +25,8 @@ try: except python_dependencies.MissingRequirementError as e: message = "\n".join([ "Missing Requirement: %s" % (str(e),), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + "To install, try:", + " sudo apt install python3-%s" % (e.dependency,), "", ]) sys.stderr.writelines(message) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 06c62ab6..7cb98c64 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) -- cgit v1.2.3 From f25ff6f46b678e9fc3bf5ecb6d0ba22af24d8e51 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 14dae65e..2ab55da3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c5555b99c98b07143e79b84f1807ba6c342bba4d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/app/__init__.py | 4 ++-- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index c3afcc57..05075566 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -25,8 +25,8 @@ try: except python_dependencies.MissingRequirementError as e: message = "\n".join([ "Missing Requirement: %s" % (str(e),), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + "To install, try:", + " sudo apt install python3-%s" % (e.dependency,), "", ]) sys.stderr.writelines(message) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 06c62ab6..7cb98c64 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) -- cgit v1.2.3 From 0ceae82c5d0b2e975b93494749ab149d4f7682de Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 14dae65e..2ab55da3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From be8421f603bdee5dad716d87dd6691f3aef5fed7 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/app/__init__.py | 4 ++-- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index c3afcc57..05075566 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -25,8 +25,8 @@ try: except python_dependencies.MissingRequirementError as e: message = "\n".join([ "Missing Requirement: %s" % (str(e),), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + "To install, try:", + " sudo apt install python3-%s" % (e.dependency,), "", ]) sys.stderr.writelines(message) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 06c62ab6..7cb98c64 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) -- cgit v1.2.3 From 858e6362b0b4262997eaa5bc34b01a04399a190c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 14dae65e..2ab55da3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From fe7a6f3855ed8019818dcf704f0d329576f0c512 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/app/__init__.py | 4 ++-- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/app/__init__.py b/synapse/app/__init__.py index c3afcc57..05075566 100644 --- a/synapse/app/__init__.py +++ b/synapse/app/__init__.py @@ -25,8 +25,8 @@ try: except python_dependencies.MissingRequirementError as e: message = "\n".join([ "Missing Requirement: %s" % (str(e),), - "To install run:", - " pip install --upgrade --force \"%s\"" % (e.dependency,), + "To install, try:", + " sudo apt install python3-%s" % (e.dependency,), "", ]) sys.stderr.writelines(message) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 06c62ab6..7cb98c64 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) -- cgit v1.2.3 From 1b752c301acb8a5236959385f58482ac2a6f7325 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd2d6d52..ab16673d 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6c3cb5b21f45f0fadd1df01b4933a56e2ba6ac58 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 76e3340a..159d8e20 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 69c5f9fe..d26b247d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -92,14 +92,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From 7631b61097694f87793bd1a81aee5fd6e0909848 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd2d6d52..ab16673d 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 55125fc11c0be312fa59469486a3553e25e24d5e Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 76e3340a..159d8e20 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 69c5f9fe..d26b247d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -92,14 +92,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From aaae0593067aeb1cfd375d6e2d4c2497ef358f41 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Wed, 16 Jan 2019 09:26:37 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d26b247d..d05c32b0 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -52,13 +52,13 @@ REQUIREMENTS = [ "pillow>=3.1.2", "sortedcontainers>=1.4.4", "psutil>=2.0.0", - "pymacaroons-pynacl>=0.9.3", - "msgpack-python>=0.4.2", + "pymacaroons>=0.9.3", + "msgpack>=0.4.2", "phonenumbers>=8.2.0", "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 "attrs>=16.0.0", "netaddr>=0.7.18", -- cgit v1.2.3 From f06dc1c379c59f820f798b14c80b9d601c7c76a4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd2d6d52..ab16673d 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From bfbb69da81625e81d75964fb7ee38067360971b8 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 76e3340a..159d8e20 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 69c5f9fe..d26b247d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -92,14 +92,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From d6f032fa369cdf35e8d54f5c5490f491c1a5d2a8 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Sun, 20 Jan 2019 15:05:38 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d26b247d..d05c32b0 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -52,13 +52,13 @@ REQUIREMENTS = [ "pillow>=3.1.2", "sortedcontainers>=1.4.4", "psutil>=2.0.0", - "pymacaroons-pynacl>=0.9.3", - "msgpack-python>=0.4.2", + "pymacaroons>=0.9.3", + "msgpack>=0.4.2", "phonenumbers>=8.2.0", "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 "attrs>=16.0.0", "netaddr>=0.7.18", -- cgit v1.2.3 From 948083bf7cbb1ccf79ac01f9aec7888b8e130ce6 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd2d6d52..ab16673d 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From cd51c1e39e4787ac7d323543053617919b0ea4d0 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 76e3340a..159d8e20 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 69c5f9fe..d26b247d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -92,14 +92,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From 3b9c662ca76dbd15c2aaa54f3f6a8bb70b549aac Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Wed, 23 Jan 2019 16:07:50 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d26b247d..d05c32b0 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -52,13 +52,13 @@ REQUIREMENTS = [ "pillow>=3.1.2", "sortedcontainers>=1.4.4", "psutil>=2.0.0", - "pymacaroons-pynacl>=0.9.3", - "msgpack-python>=0.4.2", + "pymacaroons>=0.9.3", + "msgpack>=0.4.2", "phonenumbers>=8.2.0", "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 "attrs>=16.0.0", "netaddr>=0.7.18", -- cgit v1.2.3 From 2d60526a3939bd4e74b6727ac8cecdfc9951c34c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5858fb92..a56b82d7 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From d8e65541a86b55a0f0493ef144aad2f43d9914e7 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 76e3340a..159d8e20 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 756721e3..5a68dfd0 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -103,14 +103,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From 5ae0379f47a0712811b2c23a76da678df9104a46 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Sat, 9 Feb 2019 15:34:08 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 5a68dfd0..ac0801e7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From 7619050de3bfbe3432eeaeb1d4b25a1f90e588aa Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5aec43b7..5e83740e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 8e38dffabddeee52c0f31a4eb8e27bf7854d766f Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 51e7f7e0..91c43cf6 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 76e3340a..159d8e20 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 5d087ee2..fdf6ae15 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -103,14 +103,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From 783edb8a0baeb65d1cf27c67e2fe012cbb7d0c3c Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Wed, 20 Feb 2019 11:24:24 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index fdf6ae15..298fc682 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From 852177cf9490984df13b42644faf8f444c2c7957 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5aec43b7..5e83740e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 54a55c6ee5d5a66cd8874918b00aa70f622d674b Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index ecb41240..9ad4e995 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 97db2a5b..944e6462 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f71e21ff..1614b4f7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -104,14 +104,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From b760e479c76edd6ccc377b29109ccf795298251d Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Fri, 1 Mar 2019 14:23:57 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1614b4f7..65934859 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From df15c663e2052a870637c44f8b761b0df4aee4fe Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5aec43b7..5e83740e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From dd8a77e0e23db4580d7772455a37bd712b1c0b8e Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index ecb41240..9ad4e995 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 97db2a5b..944e6462 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f71e21ff..1614b4f7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -104,14 +104,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From cf9e27d3defb14d01e0e2feadfe36819d6f7993d Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Sat, 16 Mar 2019 16:48:56 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1614b4f7..65934859 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From ab5682ba84631ef4c90ae1f3c37ce07341d9b109 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5aec43b7..5e83740e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 505b5ddee418455964cc02b1d61de09a775242d4 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index ecb41240..9ad4e995 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 97db2a5b..944e6462 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f71e21ff..1614b4f7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -104,14 +104,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From e03a526f3a632b7b72f61650b00e611cf855b0a4 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Sun, 24 Mar 2019 14:02:48 +0100 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1614b4f7..65934859 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From 448136c60045540b318abb1a150341c83fcdd67f Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Sun, 24 Mar 2019 14:02:48 +0100 Subject: Make it possible to request signing_key_path using a read command Gbp-Pq: Name config-add-signing_key_path.patch --- synapse/config/key.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/config/key.py b/synapse/config/key.py index 35f05fa9..81c54b2b 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -39,6 +39,7 @@ class KeyConfig(Config): def read_config(self, config): self.signing_key = self.read_signing_key(config["signing_key_path"]) + self.signing_key_path = config["signing_key_path"] self.old_signing_keys = self.read_old_signing_keys( config.get("old_signing_keys", {}) ) -- cgit v1.2.3 From d3d90c89e0d9bb82610db86df66fc16390454c8a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5aec43b7..5e83740e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From d713100f49d140a767d9b4246b3a3fccdc4044d8 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index ecb41240..9ad4e995 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 97db2a5b..944e6462 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f71e21ff..1614b4f7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -104,14 +104,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From 7929042a4693e4f2e6d66dd104e573be617c55f7 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Sat, 27 Apr 2019 20:03:23 +0200 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1614b4f7..65934859 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From f029dadc33e43367290b662338d521e0f8b8aaa8 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Sat, 27 Apr 2019 20:03:23 +0200 Subject: Make it possible to request signing_key_path using a read command Gbp-Pq: Name config-add-signing_key_path.patch --- synapse/config/key.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/config/key.py b/synapse/config/key.py index 35f05fa9..81c54b2b 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -39,6 +39,7 @@ class KeyConfig(Config): def read_config(self, config): self.signing_key = self.read_signing_key(config["signing_key_path"]) + self.signing_key_path = config["signing_key_path"] self.old_signing_keys = self.read_old_signing_keys( config.get("old_signing_keys", {}) ) -- cgit v1.2.3 From 227b38517ebdcdf18d0b8cd66eee19fb1eefa6f1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5aec43b7..5e83740e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 2e5d9dffd575d85c4b15e4763d00672e3ab40748 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index ecb41240..9ad4e995 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 97db2a5b..944e6462 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f71e21ff..1614b4f7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -104,14 +104,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From 5ff3c62d1fc0a058aa4f317c5d8c00f75463eb85 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Fri, 3 May 2019 22:26:41 +0200 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1614b4f7..65934859 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From ea7231c33682cd5b2f8ac3b39618228c9467f7f6 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Fri, 3 May 2019 22:26:41 +0200 Subject: Make it possible to request signing_key_path using a read command Gbp-Pq: Name config-add-signing_key_path.patch --- synapse/config/key.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/config/key.py b/synapse/config/key.py index 35f05fa9..81c54b2b 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -39,6 +39,7 @@ class KeyConfig(Config): def read_config(self, config): self.signing_key = self.read_signing_key(config["signing_key_path"]) + self.signing_key_path = config["signing_key_path"] self.old_signing_keys = self.read_old_signing_keys( config.get("old_signing_keys", {}) ) -- cgit v1.2.3 From f595397107d9e36cfed4e486e57acdf4902f7932 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 May 2019 13:46:50 +0100 Subject: [PATCH] Blacklist 0.0.0.0 and :: by default for URL previews Gbp-Pq: Name blacklist-localhost-by-default-for-URL-previews.patch --- changelog.d/5134.bugfix | 1 + synapse/config/repository.py | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 changelog.d/5134.bugfix diff --git a/changelog.d/5134.bugfix b/changelog.d/5134.bugfix new file mode 100644 index 00000000..684d48c5 --- /dev/null +++ b/changelog.d/5134.bugfix @@ -0,0 +1 @@ +Blacklist 0.0.0.0 and :: by default for URL previews. Thanks to @opnsec for identifying and responsibly disclosing this issue too! diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 944e6462..d20cda9c 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -154,17 +154,21 @@ class ContentRepositoryConfig(Config): except ImportError: raise ConfigError(MISSING_NETADDR) - if "url_preview_ip_range_blacklist" in config: - self.url_preview_ip_range_blacklist = IPSet( - config["url_preview_ip_range_blacklist"] - ) - else: + if "url_preview_ip_range_blacklist" not in config: raise ConfigError( "For security, you must specify an explicit target IP address " "blacklist in url_preview_ip_range_blacklist for url previewing " "to work" ) + self.url_preview_ip_range_blacklist = IPSet( + config["url_preview_ip_range_blacklist"] + ) + + # we always blacklist '0.0.0.0' and '::', which are supposed to be + # unroutable addresses. + self.url_preview_ip_range_blacklist.update(['0.0.0.0', '::']) + self.url_preview_ip_range_whitelist = IPSet( config.get("url_preview_ip_range_whitelist", ()) ) @@ -235,11 +239,11 @@ class ContentRepositoryConfig(Config): height: 600 method: scale - # Is the preview URL API enabled? If enabled, you *must* specify - # an explicit url_preview_ip_range_blacklist of IPs that the spider is - # denied from accessing. + # Is the preview URL API enabled? + # 'False' by default: uncomment the following to enable it (and specify a + # url_preview_ip_range_blacklist blacklist). # - url_preview_enabled: False + #url_preview_enabled: True # List of IP address CIDR ranges that the URL preview spider is denied # from accessing. There are no defaults: you must explicitly @@ -249,6 +253,9 @@ class ContentRepositoryConfig(Config): # synapse to issue arbitrary GET requests to your internal services, # causing serious security issues. # + # This must be specified if url_preview_enabled. It is recommended that you + # uncomment the following list as a starting point. + # #url_preview_ip_range_blacklist: # - '127.0.0.0/8' # - '10.0.0.0/8' @@ -259,7 +266,7 @@ class ContentRepositoryConfig(Config): # - '::1/128' # - 'fe80::/64' # - 'fc00::/7' - # + # List of IP address CIDR ranges that the URL preview spider is allowed # to access even if they are specified in url_preview_ip_range_blacklist. # This is useful for specifying exceptions to wide-ranging blacklisted -- cgit v1.2.3 From bdf93760fa7f4e0f6e30722f78d467e737b6db0a Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 May 2019 12:38:03 +0100 Subject: [PATCH] Use SystemRandom for token generation Gbp-Pq: Name use-SystemRandom-for-token-generation.patch --- changelog.d/5133.bugfix | 1 + synapse/util/stringutils.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelog.d/5133.bugfix diff --git a/changelog.d/5133.bugfix b/changelog.d/5133.bugfix new file mode 100644 index 00000000..12a32a90 --- /dev/null +++ b/changelog.d/5133.bugfix @@ -0,0 +1 @@ +Switch to using a cryptographically-secure random number generator for token strings, ensuring they cannot be predicted by an attacker. Thanks to @opnsec for for identifying and responsibly disclosing this issue! diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index fdcb375f..69dffd82 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -24,14 +24,19 @@ _string_with_symbols = ( string.digits + string.ascii_letters + ".,;:^&*-_+=#~@" ) +# random_string and random_string_with_symbols are used for a range of things, +# some cryptographically important, some less so. We use SystemRandom to make sure +# we get cryptographically-secure randoms. +rand = random.SystemRandom() + def random_string(length): - return ''.join(random.choice(string.ascii_letters) for _ in range(length)) + return ''.join(rand.choice(string.ascii_letters) for _ in range(length)) def random_string_with_symbols(length): return ''.join( - random.choice(_string_with_symbols) for _ in range(length) + rand.choice(_string_with_symbols) for _ in range(length) ) -- cgit v1.2.3 From 6ad4a03bf985bea304af411dd1e8552ab5cb5650 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Jun 2019 15:28:57 +0200 Subject: Add a NEWS entry on the room format upgrade in 0.99.5.1 --- debian/NEWS | 25 +++++++++++++++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 31 insertions(+) diff --git a/debian/NEWS b/debian/NEWS index 1239f312..2dac0e68 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,28 @@ +matrix-synapse (0.99.2-6) unstable; urgency=high + + IMPORTANT, READ THE BELOW IF YOU RUN A MATRIX HOMESERVER. + + 0.99.2 will be the latest version of Synapse included in Buster. + Unfortunately, the 0.99.5.1 version introduces an incompatible change, + a new room format version 4, which version 1.0 will default to. + As servers and chat rooms switch to the new format, 0.99.2 will not + be able to join these rooms. + + This means that once Buster is released, you will have to upgrade + Synapse to a newer version which will be available in buster-backports + by that time. Before the Buster release, newer upstream versions will + be regularly uploaded to experimental. + + I am sorry for this inconvenience. + + To learn more about this change and its impact, you can read these + blog posts by the upstream developers: + + * https://matrix.org/blog/2019/05/21/synapse-0-99-5-1-released + * https://matrix.org/blog/2019/05/24/final-countdown-to-1-0 + + -- Andrej Shadura Thu, 06 Jun 2019 15:20:52 +0200 + matrix-synapse (0.99.0-1) unstable; urgency=medium This version of the package introduces support for the Server-to-Server diff --git a/debian/changelog b/debian/changelog index a7865219..63b01ac6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse (0.99.2-6) unstable; urgency=medium + + * Add a NEWS entry on the room format upgrade in 0.99.5.1. + + -- Andrej Shadura Thu, 06 Jun 2019 15:28:41 +0200 + matrix-synapse (0.99.2-5) unstable; urgency=high * Security updates backported from 0.99.3: -- cgit v1.2.3 From 5f2d80f14db96065abc6b9a420334a0c6485ed2e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 5aec43b7..5e83740e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 9633a10508a8fa184f2c038cb613bb2228c1dfd0 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index ecb41240..9ad4e995 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 97db2a5b..944e6462 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -27,9 +27,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f71e21ff..1614b4f7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -104,14 +104,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield '"' + i + '"' + yield 'python3-' + i def check_requirements(for_feature=None, _get_distribution=get_distribution): -- cgit v1.2.3 From bed7571621e4ceb6ee0c2c041befb6621962cfe3 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Thu, 6 Jun 2019 15:28:41 +0200 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1614b4f7..65934859 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -62,7 +62,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From 8680b4dd6f2b0d35bf429fd06b162fd57577ad47 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Thu, 6 Jun 2019 15:28:41 +0200 Subject: Make it possible to request signing_key_path using a read command Gbp-Pq: Name config-add-signing_key_path.patch --- synapse/config/key.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/config/key.py b/synapse/config/key.py index 35f05fa9..81c54b2b 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -39,6 +39,7 @@ class KeyConfig(Config): def read_config(self, config): self.signing_key = self.read_signing_key(config["signing_key_path"]) + self.signing_key_path = config["signing_key_path"] self.old_signing_keys = self.read_old_signing_keys( config.get("old_signing_keys", {}) ) -- cgit v1.2.3 From d31b2dd36b92069f5e5e2984da317a290bce96fe Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 May 2019 13:46:50 +0100 Subject: [PATCH] Blacklist 0.0.0.0 and :: by default for URL previews Gbp-Pq: Name blacklist-localhost-by-default-for-URL-previews.patch --- changelog.d/5134.bugfix | 1 + synapse/config/repository.py | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 changelog.d/5134.bugfix diff --git a/changelog.d/5134.bugfix b/changelog.d/5134.bugfix new file mode 100644 index 00000000..684d48c5 --- /dev/null +++ b/changelog.d/5134.bugfix @@ -0,0 +1 @@ +Blacklist 0.0.0.0 and :: by default for URL previews. Thanks to @opnsec for identifying and responsibly disclosing this issue too! diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 944e6462..d20cda9c 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -154,17 +154,21 @@ class ContentRepositoryConfig(Config): except ImportError: raise ConfigError(MISSING_NETADDR) - if "url_preview_ip_range_blacklist" in config: - self.url_preview_ip_range_blacklist = IPSet( - config["url_preview_ip_range_blacklist"] - ) - else: + if "url_preview_ip_range_blacklist" not in config: raise ConfigError( "For security, you must specify an explicit target IP address " "blacklist in url_preview_ip_range_blacklist for url previewing " "to work" ) + self.url_preview_ip_range_blacklist = IPSet( + config["url_preview_ip_range_blacklist"] + ) + + # we always blacklist '0.0.0.0' and '::', which are supposed to be + # unroutable addresses. + self.url_preview_ip_range_blacklist.update(['0.0.0.0', '::']) + self.url_preview_ip_range_whitelist = IPSet( config.get("url_preview_ip_range_whitelist", ()) ) @@ -235,11 +239,11 @@ class ContentRepositoryConfig(Config): height: 600 method: scale - # Is the preview URL API enabled? If enabled, you *must* specify - # an explicit url_preview_ip_range_blacklist of IPs that the spider is - # denied from accessing. + # Is the preview URL API enabled? + # 'False' by default: uncomment the following to enable it (and specify a + # url_preview_ip_range_blacklist blacklist). # - url_preview_enabled: False + #url_preview_enabled: True # List of IP address CIDR ranges that the URL preview spider is denied # from accessing. There are no defaults: you must explicitly @@ -249,6 +253,9 @@ class ContentRepositoryConfig(Config): # synapse to issue arbitrary GET requests to your internal services, # causing serious security issues. # + # This must be specified if url_preview_enabled. It is recommended that you + # uncomment the following list as a starting point. + # #url_preview_ip_range_blacklist: # - '127.0.0.0/8' # - '10.0.0.0/8' @@ -259,7 +266,7 @@ class ContentRepositoryConfig(Config): # - '::1/128' # - 'fe80::/64' # - 'fc00::/7' - # + # List of IP address CIDR ranges that the URL preview spider is allowed # to access even if they are specified in url_preview_ip_range_blacklist. # This is useful for specifying exceptions to wide-ranging blacklisted -- cgit v1.2.3 From f7f891b766091dfdccd3ea4a6c9700aac2d2b630 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 May 2019 12:38:03 +0100 Subject: [PATCH] Use SystemRandom for token generation Gbp-Pq: Name use-SystemRandom-for-token-generation.patch --- changelog.d/5133.bugfix | 1 + synapse/util/stringutils.py | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 changelog.d/5133.bugfix diff --git a/changelog.d/5133.bugfix b/changelog.d/5133.bugfix new file mode 100644 index 00000000..12a32a90 --- /dev/null +++ b/changelog.d/5133.bugfix @@ -0,0 +1 @@ +Switch to using a cryptographically-secure random number generator for token strings, ensuring they cannot be predicted by an attacker. Thanks to @opnsec for for identifying and responsibly disclosing this issue! diff --git a/synapse/util/stringutils.py b/synapse/util/stringutils.py index fdcb375f..69dffd82 100644 --- a/synapse/util/stringutils.py +++ b/synapse/util/stringutils.py @@ -24,14 +24,19 @@ _string_with_symbols = ( string.digits + string.ascii_letters + ".,;:^&*-_+=#~@" ) +# random_string and random_string_with_symbols are used for a range of things, +# some cryptographically important, some less so. We use SystemRandom to make sure +# we get cryptographically-secure randoms. +rand = random.SystemRandom() + def random_string(length): - return ''.join(random.choice(string.ascii_letters) for _ in range(length)) + return ''.join(rand.choice(string.ascii_letters) for _ in range(length)) def random_string_with_symbols(length): return ''.join( - random.choice(_string_with_symbols) for _ in range(length) + rand.choice(_string_with_symbols) for _ in range(length) ) -- cgit v1.2.3 From 0f3080160952a912163854df874a50c2c4ad7f44 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index f7d7f153..5f56ab21 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -32,6 +32,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -46,6 +51,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From b8c13f3cf903c48ce3358aab42c1f96a01bd7eb3 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index ecb41240..9ad4e995 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -19,7 +19,7 @@ MISSING_JWT = ( """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ ) diff --git a/synapse/config/repository.py b/synapse/config/repository.py index fbfcecc2..da2b32bb 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -57,9 +57,7 @@ MISSING_LXML = ( """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ ) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7dfa78da..f788a5c4 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -124,14 +124,14 @@ class DependencyException(Exception): return "\n".join([ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ]) @property def dependencies(self): for i in self.args[0]: - yield "'" + i + "'" + yield "python3-" + i def check_requirements(for_feature=None): -- cgit v1.2.3 From 8181ef0b7ce2a88fd42802c563473c84e6d9d4ca Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Wed, 26 Jun 2019 13:09:57 -0500 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index f788a5c4..07398fb9 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -70,7 +70,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 -- cgit v1.2.3 From 306d1b96b02f6e91abc2f2842023548be66593df Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 965478d8..7c6526d3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -34,6 +34,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -48,6 +53,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 96f3f5e093216d690709ef4e420ce04df0e0c11f Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 36d87cef..4758f1d3 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -18,7 +18,7 @@ from ._base import Config, ConfigError MISSING_JWT = """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 80a628d9..defd4818 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -38,9 +38,7 @@ MISSING_NETADDR = "Missing netaddr library. This is required for URL preview API MISSING_LXML = """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 6324c00e..355b101f 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -117,7 +117,7 @@ class DependencyException(Exception): [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ] ) @@ -125,7 +125,7 @@ class DependencyException(Exception): @property def dependencies(self): for i in self.args[0]: - yield "'" + i + "'" + yield "python3-" + i def check_requirements(for_feature=None): -- cgit v1.2.3 From 3a21b005a4f3e6c21bccd183aa7796e6d1d68b82 Mon Sep 17 00:00:00 2001 From: Matrix Packaging Team Date: Thu, 18 Jul 2019 20:33:52 -0300 Subject: fix-deps Gbp-Pq: Name fix-deps.patch --- synapse/python_dependencies.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 355b101f..f687f181 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -67,7 +67,7 @@ REQUIREMENTS = [ "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) - "prometheus_client>=0.0.18,<0.4.0", + "prometheus_client>=0.0.18", # we use attr.s(slots), which arrived in 16.0.0 # Twisted 18.7.0 requires attrs>=17.4.0 "attrs>=17.4.0", -- cgit v1.2.3 From cea2659b45b721e2cf87a3eef447d032f76c84a1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 6ce5cd07..38aa6209 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -34,6 +34,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -48,6 +53,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c75cc5fabbb157af3544a325932831c2b11860c5 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 36d87cef..4758f1d3 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -18,7 +18,7 @@ from ._base import Config, ConfigError MISSING_JWT = """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 80a628d9..defd4818 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -38,9 +38,7 @@ MISSING_NETADDR = "Missing netaddr library. This is required for URL preview API MISSING_LXML = """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c6465c03..83d5e802 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -116,7 +116,7 @@ class DependencyException(Exception): [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ] ) @@ -124,7 +124,7 @@ class DependencyException(Exception): @property def dependencies(self): for i in self.args[0]: - yield "'" + i + "'" + yield "python3-" + i def check_requirements(for_feature=None): -- cgit v1.2.3 From 152ea839dfc1858bde00648eac6c1db41ccea131 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 6ce5cd07..38aa6209 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -34,6 +34,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -48,6 +53,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 7b2ba0aef6f7cf516dbd64042f0de667cfd6ba8c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 36d87cef..4758f1d3 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -18,7 +18,7 @@ from ._base import Config, ConfigError MISSING_JWT = """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ diff --git a/synapse/config/repository.py b/synapse/config/repository.py index 80a628d9..defd4818 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -38,9 +38,7 @@ MISSING_NETADDR = "Missing netaddr library. This is required for URL preview API MISSING_LXML = """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index c6465c03..83d5e802 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -116,7 +116,7 @@ class DependencyException(Exception): [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ] ) @@ -124,7 +124,7 @@ class DependencyException(Exception): @property def dependencies(self): for i in self.args[0]: - yield "'" + i + "'" + yield "python3-" + i def check_requirements(for_feature=None): -- cgit v1.2.3 From fe14e4b7e6bc841106f62d0e1cb1736802a33dfa Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 6ce5cd07..38aa6209 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -34,6 +34,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -48,6 +53,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 8c0ebb68c04d3fbd5ad2e7725550cd93266fe656 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 7 Sep 2018 13:57:56 +0100 Subject: Avoid telling people to install packages with pip Origin: upstream Bug: https://github.com/matrix-org/synapse/issues/3743 Gbp-Pq: Name 0006-Avoid-pip-install.patch --- synapse/config/jwt_config.py | 2 +- synapse/config/repository.py | 4 +--- synapse/python_dependencies.py | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/synapse/config/jwt_config.py b/synapse/config/jwt_config.py index 36d87cef..4758f1d3 100644 --- a/synapse/config/jwt_config.py +++ b/synapse/config/jwt_config.py @@ -18,7 +18,7 @@ from ._base import Config, ConfigError MISSING_JWT = """Missing jwt library. This is required for jwt login. Install by running: - pip install pyjwt + sudo apt install python3-jwt """ diff --git a/synapse/config/repository.py b/synapse/config/repository.py index fdb1f246..dcaada98 100644 --- a/synapse/config/repository.py +++ b/synapse/config/repository.py @@ -39,9 +39,7 @@ MISSING_NETADDR = "Missing netaddr library. This is required for URL preview API MISSING_LXML = """Missing lxml library. This is required for URL preview API. Install by running: - pip install lxml - - Requires libxslt1-dev system package. + sudo apt install python3-lxml """ diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 195a7a70..726a908d 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -117,7 +117,7 @@ class DependencyException(Exception): [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(self.dependencies),), "", ] ) @@ -125,7 +125,7 @@ class DependencyException(Exception): @property def dependencies(self): for i in self.args[0]: - yield "'" + i + "'" + yield "python3-" + i def check_requirements(for_feature=None): -- cgit v1.2.3 From 48223a425cb86d9187cfc2be63179ed698cd90e4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 31f65309..73d76000 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -34,6 +34,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -48,6 +53,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From eb58d4a4a2ca1e2b8187c64b1d26dbf5699cd0af Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From e417d55668d6044e18c89267aa167eddfa568117 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 0c76eb2b71a9f41eca078e45c00618a54fc0b77d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From b2b2ae92f0ba621e0cf984734d9a6643e173c90a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 2277f47111cef7e7a81fa2e4da2403d4a8d236d7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 7a7d9c5831faf53b95d9392bfe0d509ad3f4e212 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 243f2dcb10c5856dae4a5e0d951f75b1fa9fef95 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 7ca73e716d4d5cd8cb38d0ab80b9ced1eb554557 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From ed87c99644fe41680d1be3181058677f473ba83d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 67cc450afc7a6b783b6b01e3fae1cc37aa7761b1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 7dd7ee34e96f0058a446c346583969cae2751f74 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 33c6c8b1ff19a46636a9cba044cf0c5f0d978b24 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 5babc58438a1de37f78445f4a448c7f9232979d5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c397cae70336f35b2c3c459c8765c2be66f37bd1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08619404..ccf5f759 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From ccd518afc6a568d0f3a4e4de3dbc538afd77a15d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba846042..84d991b3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 5499cf58534f50e45a2b8be278644f7de2902e63 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba846042..84d991b3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 411cf8266a0e64566a16e9ed98afa37948c279fd Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba846042..84d991b3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 404885ed9e0299daca15ad77aadfadb4ea894716 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba846042..84d991b3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 9f3adcbbcbca4d657be168d8a105e9fc8bca2bd6 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba846042..84d991b3 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c8b1a3e0d75520c7e56ad1c92d85eb461dcdb543 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 30d1050a..5de6248e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 2c9e1d9bd4f2b81b098d64f07d45369ca1d00f3a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 30d1050a..5de6248e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From eb4e0e85626ab06601211c80a3603ba24a8705ce Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 30d1050a..5de6248e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 30f77f8f406db2d0db10a1e789af4636a814552b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 30d1050a..5de6248e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 634791ba1058ddb4b56ac405ccc4ac62789dbc6b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1391e5fc..fca1d844 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -34,6 +34,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -48,6 +53,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c731c254bf7f88c83fa6fe187fcfb53080845e36 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1391e5fc..fca1d844 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -34,6 +34,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -48,6 +53,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 297002ae8f04ec18e9b693724f7759d2e1365b13 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd137853..c32eb62a 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6f8566fbf620e9882d0ecb5b025c3292e2f2e794 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd137853..c32eb62a 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From bc5d71eed4981a44c0896942bb21c3f652a4c35e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd137853..c32eb62a 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6cd52241b9cd36f18b61f1e199a0293ec599e77b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd137853..c32eb62a 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 352048a818de7994a4b9569df22b92c3984cc827 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index fd137853..c32eb62a 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -36,6 +36,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -50,6 +55,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 0fda0af6116930e6aa06099ec2cd65ef218cd764 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ad5ab6ad..8cbbfafb 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 187e4e50ec1e370784aae90bc6069d08ebae10f7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index f8ab8e38..afed1069 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 8bfd7774d664a34a69ed18bbc7fbd7cb045be1c3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 85f65da4..f6b53c51 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From e823586627daa7468c4c1e4a39307df905f7d13e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 85f65da4..f6b53c51 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 082f439032bd164b42e8e6c71223e7db925ec13d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 85f65da4..f6b53c51 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 36e607d89c963aa590f3a04b0f1c564aa0366546 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 85f65da4..f6b53c51 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 9acfd239da80fbc28eeecd618f1c1415795abbee Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 85f65da4..f6b53c51 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 21c765b9c06ee5a9aed63a02475c0c64252b6de2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 85f65da4..f6b53c51 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 8353ac20c9eeefcfa32dae814ef7d8dc99685512 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 85f65da4..f6b53c51 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -40,6 +40,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -54,6 +59,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 3f9f74fb6cf9c850094e3f0ff0f8d460f2570abe Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 2931a882..bb01dc5f 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 1647b3a11db75c3fed711319d8a36fc0945efd3f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 2931a882..bb01dc5f 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 26dfe86ec2e300a31ea855191ce45b6266987ca0 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 94144efc..f929145c 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 0cbcc8fe98fec8029e59b5defe41a2d1046115bc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 94144efc..f929145c 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 3cb578bbe61cd67f3c14011fafdc11d4b4948167 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 94144efc..f929145c 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From bc3589511d9dfb50550300e315ad156f73a53c5b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index a851f880..0ea07654 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 9f8ce04c1e5915d7173f45018ff967b3398f0193 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 97399eb9..eb6d3bd6 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 430f2101816a39abb0664c6ce3d41769ca28cba2 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 40269667..e3bf9180 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 5a0a1bd8b142aca84bed19a0b38ae38a3830253a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: change_instructions Gbp-Pq: Name 0002-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba9cd63c..3d17239b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 9be388a3222fc2a6b2fe9296939532285cabcc88 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba9cd63c..d141be6c 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 59b6f42354ab730628ad8f18c75af2d4bae112d5 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 2a1c925e..0c99e37b 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,6 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7;python_version>='3.6'", ] CONDITIONAL_REQUIREMENTS = { -- cgit v1.2.3 From 5334e0617af48df3d3c99f5ba3bb36d1e463d575 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index ba9cd63c..d141be6c 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -50,6 +50,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -64,6 +69,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From db48f6babda3e9f9537ef4e70590e2f4cefded7b Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 2a1c925e..0c99e37b 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,6 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7;python_version>='3.6'", ] CONDITIONAL_REQUIREMENTS = { -- cgit v1.2.3 From 2b2c7087a83f237c4e9dfba9ed2e1da904a935da Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08e2c2c5..12a84a9e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 717011e669c4d59cda42900f017c22e1eb8ec4f8 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 45a6b828..abd09add 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", ] CONDITIONAL_REQUIREMENTS = { -- cgit v1.2.3 From 793b8b433c84b241ade85897b5834d1b8b606aae Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08e2c2c5..12a84a9e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 94a6df2b43e558d38d9397608fa944bcccb1a8b6 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 989523c8..84e9adcf 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", ] CONDITIONAL_REQUIREMENTS = { -- cgit v1.2.3 From 04b5a37744f6935c90db0abc7060cc5b9ac74a5d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08e2c2c5..12a84a9e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 4b0209514b7488a675f2faee4012cdaa5fdfaef7 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 546231be..2fd753ce 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 3d1bd3b35645ffe9c1983eb42d5a5147068a6245 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08e2c2c5..12a84a9e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 8560adcbe0b555610aa3b789cc248b3af09d7ec7 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 546231be..2fd753ce 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From ee93c27f8cb83f0f0f729f1ddf82f37c402767ac Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 08e2c2c5..12a84a9e 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From caec53d7888226e0e5f0c54e62fc23b367dd19fd Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 546231be..2fd753ce 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From d0a0a076d6c36d5324cb5523c8604f1280a4ff2c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d6ec618f..abb3e90b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From d225049362a6ec23625b3f8a2ed9c3f7a03ecdc4 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 271c17c2..a6820b90 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,9 +82,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 8475fb73c9fa22dcd40dacaf2eeeeb0b1a081670 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d6ec618f..abb3e90b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From f8d49621a7801e11b87652c6159faa25cf5a7408 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 271c17c2..a6820b90 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,9 +82,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From a368eb48996657206bcccbc74baf38c2383e38a9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d6ec618f..abb3e90b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 4188d266ffa393ab2462c6f8d132d2859fd74318 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 271c17c2..a6820b90 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,9 +82,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 727a83852328c6f570c6f36a8ecd40f48d8411b3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d6ec618f..abb3e90b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 3d2a85cf60ff36fd4ebff6f149948e20fefb9c1a Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 271c17c2..a6820b90 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,9 +82,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From aa9b8a0c57a146339f6b3382b8be26e70fca9c40 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d6ec618f..abb3e90b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From d89f72032e80d9902ecd48a663d3262a56605f04 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index cdcbdd77..e2328e49 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,9 +82,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 303f70a5a262a0ae2c612930c96ecbd526911ad8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d6ec618f..abb3e90b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 556e37201cc321f3493e4a9d16b82e75bc5bf65c Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index cdcbdd77..e2328e49 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,9 +82,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 67ae8211d651c3fcacd2df2ee3689ac33b7a8784 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 2cc24278..08427e1b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 85b78f911b1992d2a464aef61531182062776dbb Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index cdcbdd77..e2328e49 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -82,9 +82,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From c6846961cdb82c2857ad2bcaef60e369aa9a5276 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 2cc24278..08427e1b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From a26e40f6dcf37191a7146c90be3ee646c3e15d49 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From c43e175995f4110de2efe5b0d4dcae892fc7f41c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 2cc24278..08427e1b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From e178d3c47ba93d6a0f6df144f7765f29eb448d32 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From bc940c575fdd2118846a57723d5b67cbc55b86db Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d974a1a2..176524c2 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From b8e2df3277c3115073fd54934da0a34a3dd86255 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 25ee9d10a839a0abf075c884c40d43fca9616390 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index d974a1a2..176524c2 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 42cb5e9261521570011bcd910b3596d36087258e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 73f5c2034cfce9a54dd945a41dd0c448aa2beb47 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c4428a1..9b09609b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 3dca1b7d2a9c85ccd57ad3179d1e29238bbeadcd Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 03011ab79e095fb1924dec5a3df436fe87de7186 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c4428a1..9b09609b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 706b01c065f61faa91828982ccf7a75b20e6b226 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 0ff36090b6b83882cae5877923c37b078f32e89d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c4428a1..9b09609b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 124c05e73089a96ed9d3089bb999871f46c0a21a Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 7a920b561f917d74fd2c6f775c0bb9c19e4ea1a7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c4428a1..9b09609b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 678a84b8ae6b79aa5854ee73206970aa13c39ade Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From d4bba6966209569b7aff179ad9e8d83c99e6f28b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c4428a1..9b09609b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c9bb8a5a647541b6811893142d54d94dc0563516 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 225b03f7de6650d4da860c5ec51f72c4dadea3c6 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c4428a1..9b09609b 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -49,6 +49,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -63,6 +68,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 2ba9795c948253b63b4a4a63b792c3132bc387d2 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From 4f027655ba8d6520c9b17f3e6df1270834fa0765 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 725e89fd32b3f0a0e5fb6410f9dec776eff9c41b Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 154e5b70..6d1e66c6 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.0", ] -- cgit v1.2.3 From a6045c2d8dba02066f214f48cd617ea43e6cbdf9 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 65b75a9dab3e616ae21e1ff88374cf186c742085 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 7d269542..7bf9aa95 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -83,9 +83,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", ] -- cgit v1.2.3 From 5cd569d97c2edd34b83060bce8873a62f7bbffa5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c0d66b5ff6f32a2203e2e221f73cf7361e4e1588 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 13fb6946..68078efd 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", ] -- cgit v1.2.3 From 39418ea8041cc18b510edd11c1111e063c0c86f5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From e75ffae612a4937b8fdb29f37f5091f558436730 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d844fbb3..5ca1f2f4 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", "matrix-common==1.0.0", ] -- cgit v1.2.3 From 953ae02f63752a83cebb75203d2afb08fb4dae13 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c3b2e3740776798667ed99857bf197bbd1e01603 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d844fbb3..5ca1f2f4 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", "matrix-common==1.0.0", ] -- cgit v1.2.3 From 8e0c309d6b12b812bbd8f93aa0bbd6c6dbd69651 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6ba79f9d667e4ae6baf2291c7b126434c16a1970 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d844fbb3..5ca1f2f4 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", "matrix-common==1.0.0", ] -- cgit v1.2.3 From d95e8396690a64caa0f71c2d9c08f5ff993034c5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From eabc2e10d1bb35824fd0ac8bc1744dea57de804e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d844fbb3..5ca1f2f4 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", "matrix-common==1.0.0", ] -- cgit v1.2.3 From f3d1dc1e80e1644edcd3162eaef924d09e367d33 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From f4df277296f20f993a51db7a99fedfe1c1ce3947 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 80786464..1fced040 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -85,9 +85,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", "matrix-common==1.0.0", ] -- cgit v1.2.3 From 8ffd2285ae11e274d5bd46124fb81f0125ff0f2c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1265738d..308e56f4 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From b78ae94f52aadf0cad140d9394c871640b29f753 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 86162e0f..c73b6294 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -84,9 +84,7 @@ REQUIREMENTS = [ "Jinja2>=2.9", "bleach>=1.4.3", "typing-extensions>=3.7.4", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", "ijson>=3.1", "matrix-common~=1.1.0", ] -- cgit v1.2.3 From c44bce887e959811bfc2697fa2dca4507fd5f7df Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 8e19e2fc..b15a5d05 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 27f67044c6d7363cfc60de109c7f4a73c56b342e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1dd39f06..055278dc 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -78,9 +78,7 @@ REQUIREMENTS = [ "bleach>=1.4.3", # We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0. "typing-extensions>=3.10.0", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", # ijson 3.1.4 fixes a bug with "." in property names "ijson>=3.1.4", "matrix-common~=1.1.0", -- cgit v1.2.3 From 97e17fa58fa633ae5f1d31883c90f5f141aac3c1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 8e19e2fc..b15a5d05 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From e504c6cbcd5e5ab64aa3b42df2228f34c38fe5d2 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 1dd39f06..055278dc 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -78,9 +78,7 @@ REQUIREMENTS = [ "bleach>=1.4.3", # We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0. "typing-extensions>=3.10.0", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", # ijson 3.1.4 fixes a bug with "." in property names "ijson>=3.1.4", "matrix-common~=1.1.0", -- cgit v1.2.3 From a88beb79c1333f8a784345e4f82730c96dd19840 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 8e19e2fc..b15a5d05 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 553005888d18ba49b0a5ca75fb5f3e11cf5be791 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index d02cca0b..ef252a13 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -81,9 +81,7 @@ REQUIREMENTS = [ "bleach>=1.4.3", # We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0. "typing-extensions>=3.10.0", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", # ijson 3.1.4 fixes a bug with "." in property names "ijson>=3.1.4", "matrix-common~=1.1.0", -- cgit v1.2.3 From c93024b4b518a5548d583bfd36d1f8657a65ba92 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 179aa7ff..31b03022 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From f6322d122a4b9b74909a5ff137fa521a5b13ad73 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- synapse/python_dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index ec199a16..038788d4 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -80,9 +80,7 @@ REQUIREMENTS = [ "bleach>=1.4.3", # We use `ParamSpec`, which was added in `typing-extensions` 3.10.0.0. "typing-extensions>=3.10.0", - # We enforce that we have a `cryptography` version that bundles an `openssl` - # with the latest security patches. - "cryptography>=3.4.7", + "cryptography", # ijson 3.1.4 fixes a bug with "." in property names "ijson>=3.1.4", "matrix-common~=1.1.0", -- cgit v1.2.3 From a0d4837074dfc18ae5d16ba96c66c7aa2301d736 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 179aa7ff..31b03022 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 51bfd17a543283b7fc4d8272ff1a8d87f81914fb Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5a5a2eab..75c14c4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -148,7 +148,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "~=1.1.0" -- cgit v1.2.3 From ba84cee98eda21bb747e9034a8eb0078a7073239 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 179aa7ff..31b03022 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -60,6 +60,11 @@ class ConfigError(Exception): MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -74,6 +79,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From e47655dcbb7cf435763367d4c657bc2ea8facac6 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5a5a2eab..75c14c4e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -148,7 +148,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "~=1.1.0" -- cgit v1.2.3 From 8f68fa2d786a32bdbb73f570f8c906288be16248 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 42364fc1..58941fe2 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -98,6 +98,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -112,6 +117,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 3df8570c320bb67c743431eed3cda9bacfdea80e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8b21bdc8..e2052742 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -147,7 +147,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "~=1.1.0" -- cgit v1.2.3 From 4a0190b1485e211f8270d0f716c2c083a84f4ef8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 42364fc1..58941fe2 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -98,6 +98,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -112,6 +117,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6ac9bb498ef2790778a411d4b1ab148dd52f409d Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8b21bdc8..e2052742 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -147,7 +147,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "~=1.1.0" -- cgit v1.2.3 From 922597169920685b371cdf1c80b26eaedce28844 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 42364fc1..58941fe2 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -98,6 +98,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -112,6 +117,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c828a721913824b896d9208e1b4228cfeb53129e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8b21bdc8..e2052742 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -147,7 +147,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "~=1.1.0" -- cgit v1.2.3 From b91b47ffee8a031712685c22f4e9eca6dcff131b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 42364fc1..58941fe2 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -98,6 +98,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting anonymized homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -112,6 +117,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 3881f2f181b36fc663b9422762a2fa3d863cbddd Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7d33c08f..788cff5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -147,7 +147,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "~=1.1.0" -- cgit v1.2.3 From 5adc4c6eb89484596f9401ec1f66b97ec7e9f21c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c9cf403..980e8dbe 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -99,6 +99,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -113,6 +118,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 48d1714949400590e943e65556f969f482a397d1 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 74a473bd..feacf41b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -147,7 +147,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.2.1" -- cgit v1.2.3 From 78729d88f6b8c246d438ab36d451df20ff134e8e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c9cf403..980e8dbe 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -99,6 +99,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -113,6 +118,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From d4c887d9f1a247505ff69182192b659e36167e03 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index af7def0c..56025ab8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.2.1" -- cgit v1.2.3 From f68cf025e51695b9a67463b01d5a960de4005025 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c9cf403..980e8dbe 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -99,6 +99,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -113,6 +118,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 634cc272cb69b94a2b0205c667a15fb8d84f80cc Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index af7def0c..56025ab8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.2.1" -- cgit v1.2.3 From c56533df1b71c884a6ad28cc6fe0dc94f16a0972 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c9cf403..980e8dbe 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -99,6 +99,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -113,6 +118,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 0b2794aee7aa447d1141f8e38232043a9cda3257 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index af7def0c..56025ab8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.2.1" -- cgit v1.2.3 From 3499add92759169742cf5964119b8aee478f8850 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 56025ab8..c697d59f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From 585323b20bb1b11df8ca4cf3f932a96c8ab7d376 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c9cf403..980e8dbe 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -99,6 +99,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -113,6 +118,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 724572a2ed24baa3a602348d539692675e10fcc1 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ecc9d3e8..83182de0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.2.1" -- cgit v1.2.3 From c66f55d82dfbf3e7aa81d5cd341fecdec7ef8db6 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 83182de0..74de1b0e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From e760cb7b78987d23de0cb9f83756ac5fe6f1dbe3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c9cf403..980e8dbe 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -99,6 +99,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -113,6 +118,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 6c03f83aba5b9f4f29b5edb07705deb3731cb982 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a41d88ea..9bf9a70f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.2.1" -- cgit v1.2.3 From 6fe325105d2ceaf7dc79c6132a30ca70a4d83977 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9bf9a70f..642095c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From 128174f69931e4aaeb1b0e8ea87b031d12ac1e45 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 16:59:23 +0200 Subject: Warn users about packages installed from pip Forwarded: not-needed Gbp-Pq: Name 0004-Warn-users-about-packages-installed-from-pip.patch --- synapse/util/check_dependencies.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 66f1da75..d4317bf3 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -27,6 +27,9 @@ from packaging.requirements import Requirement DISTRIBUTION_NAME = "matrix-synapse" +pip_reported = False + +from importlib import import_module try: from importlib import metadata except ImportError: @@ -158,6 +161,8 @@ def check_requirements(extra: Optional[str] = None) -> None: :raises ValueError: if this extra does not exist. """ # First work out which dependencies are required, and which are optional. + global pip_reported + if extra is None: dependencies = _generic_dependencies() elif extra in RUNTIME_EXTRAS: @@ -166,11 +171,26 @@ def check_requirements(extra: Optional[str] = None) -> None: raise ValueError(f"Synapse {VERSION} does not provide the feature '{extra}'") deps_unfulfilled = [] + deps_pip = set() errors = [] + dist_to_pkg = {} + for pkg, dists in metadata.packages_distributions().items(): + for dist in dists: + dist_to_pkg[dist] = pkg + for (requirement, must_be_installed) in dependencies: try: dist: metadata.Distribution = metadata.distribution(requirement.name) + n = dist_to_pkg.get(requirement.name) or requirement.name.replace('-', '_') + n = n.split('/')[0] + try: + m = import_module(n) + if not (m.__file__.startswith("/usr/lib") or + m.__file__.startswith("/usr/share")): + deps_pip.add(requirement.name) + except ModuleNotFoundError: + pass except metadata.PackageNotFoundError: if must_be_installed: deps_unfulfilled.append(requirement.name) @@ -190,6 +210,18 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) + if deps_pip and not pip_reported: + logging.warning("\n".join( + [ + "The following packages were not installed from the distribution packages:", + "", + " %s" % (" ".join(deps_pip),), + "", + "If synapse fails to start, remove these packages using pip.", + ] + )) + pip_reported = True + if deps_unfulfilled: for err in errors: logging.error(err) -- cgit v1.2.3 From 5e95d2a7fbcd250da20dc08546e2727f12c7c573 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 17:10:38 +0200 Subject: Avoid telling people to install packages with pip Forwarded: not-needed Bug: https://github.com/matrix-org/synapse/issues/3743 Co-authored-by: Richard van der Hoff Gbp-Pq: Name 0005-Avoid-telling-people-to-install-packages-with-pip.patch --- synapse/util/check_dependencies.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index d4317bf3..33707e51 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -41,11 +41,14 @@ __all__ = ["check_requirements"] class DependencyException(Exception): @property def message(self) -> str: + pkgs = [ + 'python3-%s' % pkg.replace('_', '-') for pkg in self.dependencies + ] return "\n".join( [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(pkgs),), "", ] ) @@ -53,7 +56,7 @@ class DependencyException(Exception): @property def dependencies(self) -> Iterable[str]: for i in self.args[0]: - yield '"' + i + '"' + yield i DEV_EXTRAS = {"lint", "mypy", "test", "dev"} -- cgit v1.2.3 From 56b532490edca1b73f0ae275ce1c86aa25800de7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 7c9cf403..980e8dbe 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -99,6 +99,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -113,6 +118,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 949f6f19ec7d3e99c77f1e5d8c9f128aff2370f3 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index a41d88ea..9bf9a70f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.2.1" -- cgit v1.2.3 From a62ce4a0697b67cd077e0518b49d87ced7f3d803 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9bf9a70f..642095c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -112,7 +112,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From 4cfb7094036c96c8bde80a23d3dc298ca186c675 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 16:59:23 +0200 Subject: Warn users about packages installed from pip Forwarded: not-needed Gbp-Pq: Name 0004-Warn-users-about-packages-installed-from-pip.patch --- synapse/util/check_dependencies.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 66f1da75..4bbff886 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -27,6 +27,9 @@ from packaging.requirements import Requirement DISTRIBUTION_NAME = "matrix-synapse" +pip_reported = False + +from importlib import import_module try: from importlib import metadata except ImportError: @@ -158,6 +161,8 @@ def check_requirements(extra: Optional[str] = None) -> None: :raises ValueError: if this extra does not exist. """ # First work out which dependencies are required, and which are optional. + global pip_reported + if extra is None: dependencies = _generic_dependencies() elif extra in RUNTIME_EXTRAS: @@ -166,11 +171,27 @@ def check_requirements(extra: Optional[str] = None) -> None: raise ValueError(f"Synapse {VERSION} does not provide the feature '{extra}'") deps_unfulfilled = [] + deps_pip = set() errors = [] + dist_to_pkg = {} + + for dist in metadata.distributions(): + for pkg in (dist.read_text('top_level.txt') or '').split(): + dist_to_pkg[dist.metadata['Name']] = pkg + for (requirement, must_be_installed) in dependencies: try: dist: metadata.Distribution = metadata.distribution(requirement.name) + n = dist_to_pkg.get(requirement.name) or requirement.name.replace('-', '_') + n = n.split('/')[0] + try: + m = import_module(n) + if not (m.__file__.startswith("/usr/lib") or + m.__file__.startswith("/usr/share")): + deps_pip.add(requirement.name) + except ModuleNotFoundError: + pass except metadata.PackageNotFoundError: if must_be_installed: deps_unfulfilled.append(requirement.name) @@ -190,6 +211,18 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) + if deps_pip and not pip_reported: + logging.warning("\n".join( + [ + "The following packages were not installed from the distribution packages:", + "", + " %s" % (" ".join(deps_pip),), + "", + "If synapse fails to start, remove these packages using pip.", + ] + )) + pip_reported = True + if deps_unfulfilled: for err in errors: logging.error(err) -- cgit v1.2.3 From 7e357c90f58ad5d42d2063bc8152db28b6be8cd8 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 17:10:38 +0200 Subject: Avoid telling people to install packages with pip Forwarded: not-needed Bug: https://github.com/matrix-org/synapse/issues/3743 Co-authored-by: Richard van der Hoff Gbp-Pq: Name 0005-Avoid-telling-people-to-install-packages-with-pip.patch --- synapse/util/check_dependencies.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 4bbff886..0c409665 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -41,11 +41,14 @@ __all__ = ["check_requirements"] class DependencyException(Exception): @property def message(self) -> str: + pkgs = [ + 'python3-%s' % pkg.replace('_', '-') for pkg in self.dependencies + ] return "\n".join( [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(pkgs),), "", ] ) @@ -53,7 +56,7 @@ class DependencyException(Exception): @property def dependencies(self) -> Iterable[str]: for i in self.args[0]: - yield '"' + i + '"' + yield i DEV_EXTRAS = {"lint", "mypy", "test", "dev"} -- cgit v1.2.3 From 849755519130fd5a1c63dd59c37fb479c5977cc4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1f6362ae..bce0e770 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -100,6 +100,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -114,6 +119,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 1f2d9155d6eba955602d8f241e0b7f3c2838e80e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b3e12962..c47bdc67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -162,7 +162,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.3.0" -- cgit v1.2.3 From c4f6f41e52d74483f0bc67db693959e0038d22f1 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c47bdc67..0941465a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From e135bdbc15dd86b27e797deabb53baefd2ba41af Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 16:59:23 +0200 Subject: Warn users about packages installed from pip Forwarded: not-needed Gbp-Pq: Name 0004-Warn-users-about-packages-installed-from-pip.patch --- synapse/util/check_dependencies.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 66f1da75..4bbff886 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -27,6 +27,9 @@ from packaging.requirements import Requirement DISTRIBUTION_NAME = "matrix-synapse" +pip_reported = False + +from importlib import import_module try: from importlib import metadata except ImportError: @@ -158,6 +161,8 @@ def check_requirements(extra: Optional[str] = None) -> None: :raises ValueError: if this extra does not exist. """ # First work out which dependencies are required, and which are optional. + global pip_reported + if extra is None: dependencies = _generic_dependencies() elif extra in RUNTIME_EXTRAS: @@ -166,11 +171,27 @@ def check_requirements(extra: Optional[str] = None) -> None: raise ValueError(f"Synapse {VERSION} does not provide the feature '{extra}'") deps_unfulfilled = [] + deps_pip = set() errors = [] + dist_to_pkg = {} + + for dist in metadata.distributions(): + for pkg in (dist.read_text('top_level.txt') or '').split(): + dist_to_pkg[dist.metadata['Name']] = pkg + for (requirement, must_be_installed) in dependencies: try: dist: metadata.Distribution = metadata.distribution(requirement.name) + n = dist_to_pkg.get(requirement.name) or requirement.name.replace('-', '_') + n = n.split('/')[0] + try: + m = import_module(n) + if not (m.__file__.startswith("/usr/lib") or + m.__file__.startswith("/usr/share")): + deps_pip.add(requirement.name) + except ModuleNotFoundError: + pass except metadata.PackageNotFoundError: if must_be_installed: deps_unfulfilled.append(requirement.name) @@ -190,6 +211,18 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) + if deps_pip and not pip_reported: + logging.warning("\n".join( + [ + "The following packages were not installed from the distribution packages:", + "", + " %s" % (" ".join(deps_pip),), + "", + "If synapse fails to start, remove these packages using pip.", + ] + )) + pip_reported = True + if deps_unfulfilled: for err in errors: logging.error(err) -- cgit v1.2.3 From 84909599f8d2d102f82fa3edec3f1fe117f063bf Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 17:10:38 +0200 Subject: Avoid telling people to install packages with pip Forwarded: not-needed Bug: https://github.com/matrix-org/synapse/issues/3743 Co-authored-by: Richard van der Hoff Gbp-Pq: Name 0005-Avoid-telling-people-to-install-packages-with-pip.patch --- synapse/util/check_dependencies.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 4bbff886..0c409665 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -41,11 +41,14 @@ __all__ = ["check_requirements"] class DependencyException(Exception): @property def message(self) -> str: + pkgs = [ + 'python3-%s' % pkg.replace('_', '-') for pkg in self.dependencies + ] return "\n".join( [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(pkgs),), "", ] ) @@ -53,7 +56,7 @@ class DependencyException(Exception): @property def dependencies(self) -> Iterable[str]: for i in self.args[0]: - yield '"' + i + '"' + yield i DEV_EXTRAS = {"lint", "mypy", "test", "dev"} -- cgit v1.2.3 From 9b9258bbb011076a8aeb19c0bd2c85861772d490 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: =?UTF-8?q?Don=E2=80=99t=20make=20setuptools=5Frust=20an=20actual?= =?UTF-8?q?=20runtime=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gbp-Pq: Name downgrade-setuptools-rust.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0941465a..c3b68087 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -182,7 +182,7 @@ pydantic = ">=1.7.4" # This isn't really a dev-dependency, as `poetry install --no-dev` will fail, # but the alternative is to add it to the main list of deps where it isn't # needed. -setuptools_rust = ">=1.3" +#setuptools_rust = ">=1.3" # Optional Dependencies -- cgit v1.2.3 From c707b6662a78d4330081ef462e714f426128bcbc Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: Tell cargo to use vendored sources Gbp-Pq: Name vendored-sources.patch --- .cargo/config.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..02369289 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" -- cgit v1.2.3 From a9d4886a72ac8dc0de22cfca9f1fe2bc3be407a7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1f6362ae..bce0e770 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -100,6 +100,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -114,6 +119,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From a2db2f6c44992cdc93149f03a58cf8c9220f046d Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5eab8d24..b76e869f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -162,7 +162,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.3.0" -- cgit v1.2.3 From f925d28ab80a0c15274e0fc851958259e089600a Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b76e869f..6bdb13ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From 62362c12d65cd8d23a6eea0f844fe6b129ef8977 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 16:59:23 +0200 Subject: Warn users about packages installed from pip Forwarded: not-needed Gbp-Pq: Name 0004-Warn-users-about-packages-installed-from-pip.patch --- synapse/util/check_dependencies.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 3b1e2057..bb54b01c 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -27,6 +27,9 @@ from packaging.requirements import Requirement DISTRIBUTION_NAME = "matrix-synapse" +pip_reported = False + +from importlib import import_module try: from importlib import metadata except ImportError: @@ -173,6 +176,8 @@ def check_requirements(extra: Optional[str] = None) -> None: :raises ValueError: if this extra does not exist. """ # First work out which dependencies are required, and which are optional. + global pip_reported + if extra is None: dependencies = _generic_dependencies() elif extra in RUNTIME_EXTRAS: @@ -181,11 +186,27 @@ def check_requirements(extra: Optional[str] = None) -> None: raise ValueError(f"Synapse {VERSION} does not provide the feature '{extra}'") deps_unfulfilled = [] + deps_pip = set() errors = [] + dist_to_pkg = {} + + for dist in metadata.distributions(): + for pkg in (dist.read_text('top_level.txt') or '').split(): + dist_to_pkg[dist.metadata['Name']] = pkg + for (requirement, must_be_installed) in dependencies: try: dist: metadata.Distribution = metadata.distribution(requirement.name) + n = dist_to_pkg.get(requirement.name) or requirement.name.replace('-', '_') + n = n.split('/')[0] + try: + m = import_module(n) + if not (m.__file__.startswith("/usr/lib") or + m.__file__.startswith("/usr/share")): + deps_pip.add(requirement.name) + except ModuleNotFoundError: + pass except metadata.PackageNotFoundError: if must_be_installed: deps_unfulfilled.append(requirement.name) @@ -205,6 +226,18 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) + if deps_pip and not pip_reported: + logging.warning("\n".join( + [ + "The following packages were not installed from the distribution packages:", + "", + " %s" % (" ".join(deps_pip),), + "", + "If synapse fails to start, remove these packages using pip.", + ] + )) + pip_reported = True + if deps_unfulfilled: for err in errors: logging.error(err) -- cgit v1.2.3 From ca7b7d008fb43fd41e6d2072d93eb7116829b639 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 17:10:38 +0200 Subject: Avoid telling people to install packages with pip Forwarded: not-needed Bug: https://github.com/matrix-org/synapse/issues/3743 Co-authored-by: Richard van der Hoff Gbp-Pq: Name 0005-Avoid-telling-people-to-install-packages-with-pip.patch --- synapse/util/check_dependencies.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index bb54b01c..28f39890 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -41,11 +41,14 @@ __all__ = ["check_requirements"] class DependencyException(Exception): @property def message(self) -> str: + pkgs = [ + 'python3-%s' % pkg.replace('_', '-') for pkg in self.dependencies + ] return "\n".join( [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(pkgs),), "", ] ) @@ -53,7 +56,7 @@ class DependencyException(Exception): @property def dependencies(self) -> Iterable[str]: for i in self.args[0]: - yield '"' + i + '"' + yield i DEV_EXTRAS = {"lint", "mypy", "test", "dev"} -- cgit v1.2.3 From 18d0505cb8165ab0eff1ac58f9f57c6db1e52ba9 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: =?UTF-8?q?Don=E2=80=99t=20make=20setuptools=5Frust=20an=20actual?= =?UTF-8?q?=20runtime=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gbp-Pq: Name downgrade-setuptools-rust.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6bdb13ed..1dbf2019 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -182,7 +182,7 @@ pydantic = ">=1.7.4" # This isn't really a dev-dependency, as `poetry install --no-dev` will fail, # but the alternative is to add it to the main list of deps where it isn't # needed. -setuptools_rust = ">=1.3" +#setuptools_rust = ">=1.3" # Optional Dependencies -- cgit v1.2.3 From 422c1205d91e1195941aff6468098e5aad68b17b Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: Tell cargo to use vendored sources Gbp-Pq: Name vendored-sources.patch --- .cargo/config.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..02369289 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" -- cgit v1.2.3 From 37d82f5fdcadf73196c651f3c8eb8267aba8f702 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1f6362ae..bce0e770 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -100,6 +100,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -114,6 +119,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From 0f40c81de80ac75934e65d5e122590281f0c229c Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 41608092..60f5744d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -162,7 +162,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.3.0" -- cgit v1.2.3 From ad2547ffa807531f30a7a284cb840a24a35cbf6e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 60f5744d..488dcfbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From dae30a869084da9e15266652516d1b9789729a74 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 16:59:23 +0200 Subject: Warn users about packages installed from pip Forwarded: not-needed Gbp-Pq: Name 0004-Warn-users-about-packages-installed-from-pip.patch --- synapse/util/check_dependencies.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 3b1e2057..bb54b01c 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -27,6 +27,9 @@ from packaging.requirements import Requirement DISTRIBUTION_NAME = "matrix-synapse" +pip_reported = False + +from importlib import import_module try: from importlib import metadata except ImportError: @@ -173,6 +176,8 @@ def check_requirements(extra: Optional[str] = None) -> None: :raises ValueError: if this extra does not exist. """ # First work out which dependencies are required, and which are optional. + global pip_reported + if extra is None: dependencies = _generic_dependencies() elif extra in RUNTIME_EXTRAS: @@ -181,11 +186,27 @@ def check_requirements(extra: Optional[str] = None) -> None: raise ValueError(f"Synapse {VERSION} does not provide the feature '{extra}'") deps_unfulfilled = [] + deps_pip = set() errors = [] + dist_to_pkg = {} + + for dist in metadata.distributions(): + for pkg in (dist.read_text('top_level.txt') or '').split(): + dist_to_pkg[dist.metadata['Name']] = pkg + for (requirement, must_be_installed) in dependencies: try: dist: metadata.Distribution = metadata.distribution(requirement.name) + n = dist_to_pkg.get(requirement.name) or requirement.name.replace('-', '_') + n = n.split('/')[0] + try: + m = import_module(n) + if not (m.__file__.startswith("/usr/lib") or + m.__file__.startswith("/usr/share")): + deps_pip.add(requirement.name) + except ModuleNotFoundError: + pass except metadata.PackageNotFoundError: if must_be_installed: deps_unfulfilled.append(requirement.name) @@ -205,6 +226,18 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) + if deps_pip and not pip_reported: + logging.warning("\n".join( + [ + "The following packages were not installed from the distribution packages:", + "", + " %s" % (" ".join(deps_pip),), + "", + "If synapse fails to start, remove these packages using pip.", + ] + )) + pip_reported = True + if deps_unfulfilled: for err in errors: logging.error(err) -- cgit v1.2.3 From ffae99f89ffd8d15f63d940126a67e617fc7e602 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 17:10:38 +0200 Subject: Avoid telling people to install packages with pip Forwarded: not-needed Bug: https://github.com/matrix-org/synapse/issues/3743 Co-authored-by: Richard van der Hoff Gbp-Pq: Name 0005-Avoid-telling-people-to-install-packages-with-pip.patch --- synapse/util/check_dependencies.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index bb54b01c..28f39890 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -41,11 +41,14 @@ __all__ = ["check_requirements"] class DependencyException(Exception): @property def message(self) -> str: + pkgs = [ + 'python3-%s' % pkg.replace('_', '-') for pkg in self.dependencies + ] return "\n".join( [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(pkgs),), "", ] ) @@ -53,7 +56,7 @@ class DependencyException(Exception): @property def dependencies(self) -> Iterable[str]: for i in self.args[0]: - yield '"' + i + '"' + yield i DEV_EXTRAS = {"lint", "mypy", "test", "dev"} -- cgit v1.2.3 From 39050a666b2b0ea663d6fa20ecf162e1003bba35 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Sun, 30 Oct 2022 12:26:49 +0100 Subject: Revert Cargo.lock changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want to bump vendored dependencies needlessly. Gbp-Pq: Name 0006-Revert-Cargo.lock-changes.patch --- Cargo.lock | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3090ad7..b952b6b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,9 +104,9 @@ checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "lazy_static" @@ -116,15 +116,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ "autocfg", "scopeguard", @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" [[package]] name = "parking_lot" @@ -185,18 +185,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201b6887e5576bf2f945fe65172c1fcbf3fcf285b23e4d71eb171d9736e38d32" +checksum = "12f72538a0230791398a0986a6518ebd88abc3fded89007b506ed072acc831e1" dependencies = [ "anyhow", "cfg-if", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0708c9ed01692635cbf056e286008e5a2927ab1a5e48cdd3aeb1ba5a6fef47" +checksum = "fc4cf18c20f4f09995f3554e6bcf9b09bd5e4d6b67c562fdfaafa644526ba479" dependencies = [ "once_cell", "target-lexicon", @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90352dea4f486932b72ddf776264d293f85b79a1d214de1d023927b41461132d" +checksum = "a41877f28d8ebd600b6aa21a17b40c3b0fc4dfe73a27b6e81ab3d895e401b0e9" dependencies = [ "libc", "pyo3-build-config", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb24b804a2d9e88bfcc480a5a6dd76f006c1e3edaf064e8250423336e2cd79d" +checksum = "2e81c8d4bcc2f216dc1b665412df35e46d12ee8d3d046b381aad05f1fcf30547" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22bb49f6a7348c253d7ac67a6875f2dc65f36c2ae64a82c381d528972bea6d6" +checksum = "85752a767ee19399a78272cc2ab625cd7d373b2e112b4b13db28de71fa892784" dependencies = [ "proc-macro2", "quote", @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "subtle" @@ -366,9 +366,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", @@ -406,9 +406,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unindent" -- cgit v1.2.3 From dcf5e2e9810c1c05724b8731aac0c4cecab94675 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: =?UTF-8?q?Don=E2=80=99t=20make=20setuptools=5Frust=20an=20actual?= =?UTF-8?q?=20runtime=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gbp-Pq: Name downgrade-setuptools-rust.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 488dcfbe..495d5638 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -182,7 +182,7 @@ pydantic = ">=1.7.4" # This isn't really a dev-dependency, as `poetry install --no-dev` will fail, # but the alternative is to add it to the main list of deps where it isn't # needed. -setuptools_rust = ">=1.3" +#setuptools_rust = ">=1.3" # Optional Dependencies -- cgit v1.2.3 From b7735079d12d43026ffbf026c780fdc71de143ae Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: Tell cargo to use vendored sources Gbp-Pq: Name vendored-sources.patch --- .cargo/config.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..02369289 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" -- cgit v1.2.3 From d2dac6ca23aa65cfe59c6ecdaf8d37d63776968a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1f6362ae..bce0e770 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -100,6 +100,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -114,6 +119,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From c4b49b35b7150b868d7d19b0312101c94a2b63b0 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e07a208e..7653caf8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -162,7 +162,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.3.0" -- cgit v1.2.3 From bd6d5465db073f0ce7470361d0f3685ec5364d0e Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7653caf8..b76f557f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From 8e8931aee2f57638ff723c982b7bdbca2ca7de1f Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 16:59:23 +0200 Subject: Warn users about packages installed from pip Forwarded: not-needed Gbp-Pq: Name 0004-Warn-users-about-packages-installed-from-pip.patch --- synapse/util/check_dependencies.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 3b1e2057..bb54b01c 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -27,6 +27,9 @@ from packaging.requirements import Requirement DISTRIBUTION_NAME = "matrix-synapse" +pip_reported = False + +from importlib import import_module try: from importlib import metadata except ImportError: @@ -173,6 +176,8 @@ def check_requirements(extra: Optional[str] = None) -> None: :raises ValueError: if this extra does not exist. """ # First work out which dependencies are required, and which are optional. + global pip_reported + if extra is None: dependencies = _generic_dependencies() elif extra in RUNTIME_EXTRAS: @@ -181,11 +186,27 @@ def check_requirements(extra: Optional[str] = None) -> None: raise ValueError(f"Synapse {VERSION} does not provide the feature '{extra}'") deps_unfulfilled = [] + deps_pip = set() errors = [] + dist_to_pkg = {} + + for dist in metadata.distributions(): + for pkg in (dist.read_text('top_level.txt') or '').split(): + dist_to_pkg[dist.metadata['Name']] = pkg + for (requirement, must_be_installed) in dependencies: try: dist: metadata.Distribution = metadata.distribution(requirement.name) + n = dist_to_pkg.get(requirement.name) or requirement.name.replace('-', '_') + n = n.split('/')[0] + try: + m = import_module(n) + if not (m.__file__.startswith("/usr/lib") or + m.__file__.startswith("/usr/share")): + deps_pip.add(requirement.name) + except ModuleNotFoundError: + pass except metadata.PackageNotFoundError: if must_be_installed: deps_unfulfilled.append(requirement.name) @@ -205,6 +226,18 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) + if deps_pip and not pip_reported: + logging.warning("\n".join( + [ + "The following packages were not installed from the distribution packages:", + "", + " %s" % (" ".join(deps_pip),), + "", + "If synapse fails to start, remove these packages using pip.", + ] + )) + pip_reported = True + if deps_unfulfilled: for err in errors: logging.error(err) -- cgit v1.2.3 From 280a64d2c66cb80720dd82f5af657c1a76cde6e8 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 17:10:38 +0200 Subject: Avoid telling people to install packages with pip Forwarded: not-needed Bug: https://github.com/matrix-org/synapse/issues/3743 Co-authored-by: Richard van der Hoff Gbp-Pq: Name 0005-Avoid-telling-people-to-install-packages-with-pip.patch --- synapse/util/check_dependencies.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index bb54b01c..28f39890 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -41,11 +41,14 @@ __all__ = ["check_requirements"] class DependencyException(Exception): @property def message(self) -> str: + pkgs = [ + 'python3-%s' % pkg.replace('_', '-') for pkg in self.dependencies + ] return "\n".join( [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(pkgs),), "", ] ) @@ -53,7 +56,7 @@ class DependencyException(Exception): @property def dependencies(self) -> Iterable[str]: for i in self.args[0]: - yield '"' + i + '"' + yield i DEV_EXTRAS = {"lint", "mypy", "test", "dev"} -- cgit v1.2.3 From 0d316da686a9b2c835779485e31cb4806527f219 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Sun, 30 Oct 2022 12:26:49 +0100 Subject: Revert Cargo.lock changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want to bump vendored dependencies needlessly. Gbp-Pq: Name 0006-Revert-Cargo.lock-changes.patch --- Cargo.lock | 68 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1107578a..b952b6b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "arc-swap" @@ -104,9 +104,9 @@ checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "lazy_static" @@ -116,15 +116,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ "autocfg", "scopeguard", @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" [[package]] name = "parking_lot" @@ -185,18 +185,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201b6887e5576bf2f945fe65172c1fcbf3fcf285b23e4d71eb171d9736e38d32" +checksum = "12f72538a0230791398a0986a6518ebd88abc3fded89007b506ed072acc831e1" dependencies = [ "anyhow", "cfg-if", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0708c9ed01692635cbf056e286008e5a2927ab1a5e48cdd3aeb1ba5a6fef47" +checksum = "fc4cf18c20f4f09995f3554e6bcf9b09bd5e4d6b67c562fdfaafa644526ba479" dependencies = [ "once_cell", "target-lexicon", @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90352dea4f486932b72ddf776264d293f85b79a1d214de1d023927b41461132d" +checksum = "a41877f28d8ebd600b6aa21a17b40c3b0fc4dfe73a27b6e81ab3d895e401b0e9" dependencies = [ "libc", "pyo3-build-config", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb24b804a2d9e88bfcc480a5a6dd76f006c1e3edaf064e8250423336e2cd79d" +checksum = "2e81c8d4bcc2f216dc1b665412df35e46d12ee8d3d046b381aad05f1fcf30547" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22bb49f6a7348c253d7ac67a6875f2dc65f36c2ae64a82c381d528972bea6d6" +checksum = "85752a767ee19399a78272cc2ab625cd7d373b2e112b4b13db28de71fa892784" dependencies = [ "proc-macro2", "quote", @@ -323,18 +323,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "subtle" @@ -366,9 +366,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", @@ -406,9 +406,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unindent" -- cgit v1.2.3 From cf610d5287fed70293ddde5f5517c4090b230f78 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: =?UTF-8?q?Don=E2=80=99t=20make=20setuptools=5Frust=20an=20actual?= =?UTF-8?q?=20runtime=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gbp-Pq: Name downgrade-setuptools-rust.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b76f557f..41c8965e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -182,7 +182,7 @@ pydantic = ">=1.7.4" # This isn't really a dev-dependency, as `poetry install --no-dev` will fail, # but the alternative is to add it to the main list of deps where it isn't # needed. -setuptools_rust = ">=1.3" +#setuptools_rust = ">=1.3" # Optional Dependencies -- cgit v1.2.3 From 042ce1ea2eef4d70014543b97a8770542119137d Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: Tell cargo to use vendored sources Gbp-Pq: Name vendored-sources.patch --- .cargo/config.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..02369289 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" -- cgit v1.2.3 From 7a1c3650880ef9cbb00332459e2e29be26cac30a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 10 Jun 2016 10:57:07 +0100 Subject: Point users to dpkg-reconfigure when debconf-managed settings are missing Gbp-Pq: Name 0001-change_instructions.patch --- synapse/config/_base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1f6362ae..bce0e770 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -100,6 +100,11 @@ def format_config_error(e: ConfigError) -> Iterator[str]: MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\ Please opt in or out of reporting homeserver usage statistics, by setting the `report_stats` key in your config file to either True or False. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ MISSING_REPORT_STATS_SPIEL = """\ @@ -114,6 +119,11 @@ Thank you. MISSING_SERVER_NAME = """\ Missing mandatory `server_name` config option. + +To set it, run: + + dpkg-reconfigure matrix-synapse + """ -- cgit v1.2.3 From df135395542ad85ba71a918a110e84c2aecc255f Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 7 Apr 2021 13:48:48 +0200 Subject: Drop a version bump unnecessary in Debian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In Debian, python3-cryptography doesn’t bundle openssl anyway. Gbp-Pq: Name 0002-dont-bump-cryptography.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e07a208e..7653caf8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -162,7 +162,7 @@ bleach = ">=1.4.3" typing-extensions = ">=3.10.0.1" # We enforce that we have a `cryptography` version that bundles an `openssl` # with the latest security patches. -cryptography = ">=3.4.7" +cryptography = ">=3" # ijson 3.1.4 fixes a bug with "." in property names ijson = ">=3.1.4" matrix-common = "^1.3.0" -- cgit v1.2.3 From d0f002ea6f8a346788ae67b5b868d5b56bfacfb6 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 11 Aug 2022 12:32:43 +0200 Subject: Bump canonicaljson to 1.6.2 Gbp-Pq: Name 0003-bump-canonicaljson.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7653caf8..b76f557f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,7 @@ frozendict = ">=1,!=2.1.2" unpaddedbase64 = ">=2.1.0" # We require 1.5.0 to work around an issue when running against the C implementation of # frozendict: https://github.com/matrix-org/python-canonicaljson/issues/36 -canonicaljson = "^1.5.0" +canonicaljson = ">=1.6.0" # we use the type definitions added in signedjson 1.1. signedjson = "^1.1.0" # validating SSL certs for IP addresses requires service_identity 18.1. -- cgit v1.2.3 From b271dc767170688a488f92b0cf896278f67daefa Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 16:59:23 +0200 Subject: Warn users about packages installed from pip Forwarded: not-needed Gbp-Pq: Name 0004-Warn-users-about-packages-installed-from-pip.patch --- synapse/util/check_dependencies.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index 3b1e2057..bb54b01c 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -27,6 +27,9 @@ from packaging.requirements import Requirement DISTRIBUTION_NAME = "matrix-synapse" +pip_reported = False + +from importlib import import_module try: from importlib import metadata except ImportError: @@ -173,6 +176,8 @@ def check_requirements(extra: Optional[str] = None) -> None: :raises ValueError: if this extra does not exist. """ # First work out which dependencies are required, and which are optional. + global pip_reported + if extra is None: dependencies = _generic_dependencies() elif extra in RUNTIME_EXTRAS: @@ -181,11 +186,27 @@ def check_requirements(extra: Optional[str] = None) -> None: raise ValueError(f"Synapse {VERSION} does not provide the feature '{extra}'") deps_unfulfilled = [] + deps_pip = set() errors = [] + dist_to_pkg = {} + + for dist in metadata.distributions(): + for pkg in (dist.read_text('top_level.txt') or '').split(): + dist_to_pkg[dist.metadata['Name']] = pkg + for (requirement, must_be_installed) in dependencies: try: dist: metadata.Distribution = metadata.distribution(requirement.name) + n = dist_to_pkg.get(requirement.name) or requirement.name.replace('-', '_') + n = n.split('/')[0] + try: + m = import_module(n) + if not (m.__file__.startswith("/usr/lib") or + m.__file__.startswith("/usr/share")): + deps_pip.add(requirement.name) + except ModuleNotFoundError: + pass except metadata.PackageNotFoundError: if must_be_installed: deps_unfulfilled.append(requirement.name) @@ -205,6 +226,18 @@ def check_requirements(extra: Optional[str] = None) -> None: deps_unfulfilled.append(requirement.name) errors.append(_incorrect_version(requirement, dist.version, extra)) + if deps_pip and not pip_reported: + logging.warning("\n".join( + [ + "The following packages were not installed from the distribution packages:", + "", + " %s" % (" ".join(deps_pip),), + "", + "If synapse fails to start, remove these packages using pip.", + ] + )) + pip_reported = True + if deps_unfulfilled: for err in errors: logging.error(err) -- cgit v1.2.3 From df1ee64d45a96f70a69d64b0b52e935a348dc6d0 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Wed, 31 Aug 2022 17:10:38 +0200 Subject: Avoid telling people to install packages with pip Forwarded: not-needed Bug: https://github.com/matrix-org/synapse/issues/3743 Co-authored-by: Richard van der Hoff Gbp-Pq: Name 0005-Avoid-telling-people-to-install-packages-with-pip.patch --- synapse/util/check_dependencies.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/synapse/util/check_dependencies.py b/synapse/util/check_dependencies.py index bb54b01c..28f39890 100644 --- a/synapse/util/check_dependencies.py +++ b/synapse/util/check_dependencies.py @@ -41,11 +41,14 @@ __all__ = ["check_requirements"] class DependencyException(Exception): @property def message(self) -> str: + pkgs = [ + 'python3-%s' % pkg.replace('_', '-') for pkg in self.dependencies + ] return "\n".join( [ "Missing Requirements: %s" % (", ".join(self.dependencies),), "To install run:", - " pip install --upgrade --force %s" % (" ".join(self.dependencies),), + " sudo apt install %s" % (" ".join(pkgs),), "", ] ) @@ -53,7 +56,7 @@ class DependencyException(Exception): @property def dependencies(self) -> Iterable[str]: for i in self.args[0]: - yield '"' + i + '"' + yield i DEV_EXTRAS = {"lint", "mypy", "test", "dev"} -- cgit v1.2.3 From 42205ee4439e40afae666750e5d1657de4331ed6 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Sun, 30 Oct 2022 12:26:49 +0100 Subject: Revert Cargo.lock changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don’t want to bump vendored dependencies needlessly. Gbp-Pq: Name 0006-Revert-Cargo.lock-changes.patch --- Cargo.lock | 68 ++++++++++++++++++++++++++++----------------------------- rust/Cargo.toml | 6 ++--- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1107578a..b952b6b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "arc-swap" @@ -104,9 +104,9 @@ checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "lazy_static" @@ -116,15 +116,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ "autocfg", "scopeguard", @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" [[package]] name = "parking_lot" @@ -185,18 +185,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201b6887e5576bf2f945fe65172c1fcbf3fcf285b23e4d71eb171d9736e38d32" +checksum = "12f72538a0230791398a0986a6518ebd88abc3fded89007b506ed072acc831e1" dependencies = [ "anyhow", "cfg-if", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0708c9ed01692635cbf056e286008e5a2927ab1a5e48cdd3aeb1ba5a6fef47" +checksum = "fc4cf18c20f4f09995f3554e6bcf9b09bd5e4d6b67c562fdfaafa644526ba479" dependencies = [ "once_cell", "target-lexicon", @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90352dea4f486932b72ddf776264d293f85b79a1d214de1d023927b41461132d" +checksum = "a41877f28d8ebd600b6aa21a17b40c3b0fc4dfe73a27b6e81ab3d895e401b0e9" dependencies = [ "libc", "pyo3-build-config", @@ -243,9 +243,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb24b804a2d9e88bfcc480a5a6dd76f006c1e3edaf064e8250423336e2cd79d" +checksum = "2e81c8d4bcc2f216dc1b665412df35e46d12ee8d3d046b381aad05f1fcf30547" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.17.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22bb49f6a7348c253d7ac67a6875f2dc65f36c2ae64a82c381d528972bea6d6" +checksum = "85752a767ee19399a78272cc2ab625cd7d373b2e112b4b13db28de71fa892784" dependencies = [ "proc-macro2", "quote", @@ -323,18 +323,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -354,9 +354,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "subtle" @@ -366,9 +366,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ "proc-macro2", "quote", @@ -406,9 +406,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" [[package]] name = "unindent" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index e2620188..cffaa5b5 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -20,15 +20,15 @@ crate-type = ["lib", "cdylib"] name = "synapse.synapse_rust" [dependencies] -anyhow = "1.0.66" +anyhow = "1.0.63" lazy_static = "1.4.0" log = "0.4.17" pyo3 = { version = "0.17.1", features = ["extension-module", "macros", "anyhow", "abi3", "abi3-py37"] } pyo3-log = "0.7.0" pythonize = "0.17.0" regex = "1.6.0" -serde = { version = "1.0.147", features = ["derive"] } -serde_json = "1.0.87" +serde = { version = "1.0.144", features = ["derive"] } +serde_json = "1.0.85" [build-dependencies] blake2 = "0.10.4" -- cgit v1.2.3 From e86d3df3ae382cdd1fbe9835949a1434228a3f3c Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: =?UTF-8?q?Don=E2=80=99t=20make=20setuptools=5Frust=20an=20actual?= =?UTF-8?q?=20runtime=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gbp-Pq: Name downgrade-setuptools-rust.patch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b76f557f..41c8965e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -182,7 +182,7 @@ pydantic = ">=1.7.4" # This isn't really a dev-dependency, as `poetry install --no-dev` will fail, # but the alternative is to add it to the main list of deps where it isn't # needed. -setuptools_rust = ">=1.3" +#setuptools_rust = ">=1.3" # Optional Dependencies -- cgit v1.2.3 From 9ea1a1dbce9b308eab075ae0954270a707230137 Mon Sep 17 00:00:00 2001 From: Andrej Shadura Date: Thu, 6 Oct 2022 19:00:16 +0200 Subject: Tell cargo to use vendored sources Gbp-Pq: Name vendored-sources.patch --- .cargo/config.toml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..02369289 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" -- cgit v1.2.3