From b2984148ca2f704f6ba8713104f742c321929c3f Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Mon, 5 Aug 2019 17:21:37 +0100 Subject: [PATCH] Missing import --- .../webui/js/components/PortSelection.jsx | 0 .../view/webui/js/components/TLS.jsx | 46 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 synapse_topology/view/webui/js/components/PortSelection.jsx diff --git a/synapse_topology/view/webui/js/components/PortSelection.jsx b/synapse_topology/view/webui/js/components/PortSelection.jsx new file mode 100644 index 0000000000..e69de29bb2 diff --git a/synapse_topology/view/webui/js/components/TLS.jsx b/synapse_topology/view/webui/js/components/TLS.jsx index 7fa3ee4e90..2dc560f708 100644 --- a/synapse_topology/view/webui/js/components/TLS.jsx +++ b/synapse_topology/view/webui/js/components/TLS.jsx @@ -12,7 +12,7 @@ const haproxyLink = "http://www.haproxy.org/"; const nginxLink = "https://www.nginx.com/"; const proxyInfoLink = "https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.rst"; -export default ({ onClickACME, onClickTLS, onClickNoTLS }) => +export default ({ onClickACME, onClickTLS, onClickReverseProxy, onClickNoTLS }) =>

TLS

@@ -24,26 +24,6 @@ export default ({ onClickACME, onClickTLS, onClickNoTLS }) => need a TLS cert. You can use ACME, provide your own certs, or let the reverse proxy handle the TLS certs instead. (You can also not use TLS but that's not recommended)

-

- ACME -

-

- ACME is a super cool initiative a protocol that allows TLS - certificates to be requested automagically. Synapse supports ACME by requesting - certs from Let's Encrypt. This is the easiest way to manage your certs because - once you set it up you don't need to manage it. -

-

- If you wish to use ACME you will need access to port 80 which usually requires - root privileges. Do not run Synapse as root. Use a Reverse Proxy or Authbind -

-

- Provide your own -

-

- If you have your own TLS certs for the domain you can specify a path - to them or you can upload them for synapse to use. -

ReverseProxy

@@ -67,7 +47,27 @@ export default ({ onClickACME, onClickTLS, onClickNoTLS }) => configuration templates later. Easy breasy.

- More information in the docs. + More information about Reverse Proxies in the docs. +

+

+ ACME +

+

+ ACME is a super cool initiative a protocol that allows TLS + certificates to be requested automagically. Synapse supports ACME by requesting + certs from Let's Encrypt. This is the easiest way to manage your certs because + once you set it up you don't need to manage it. +

+

+ If you wish to use ACME you will need access to port 80 which usually requires + root privileges. Do not run Synapse as root. Use a Reverse Proxy or Authbind +

+

+ Provide your own TLS certs +

+

+ If you have your own TLS certs for the domain we'll ask you for the path + to them or you can upload them for synapse to use.

Don't use TLS @@ -77,8 +77,8 @@ export default ({ onClickACME, onClickTLS, onClickNoTLS }) =>

+ -