From 235f686da965cb08eea500ea11af8b591fe9d8c8 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 16:56:57 +0100 Subject: [PATCH 1/9] Update default endpoint port to match the default ports in the config --- synapse/http/endpoint.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index a6ebe23567..6c1fdcb853 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -50,11 +50,11 @@ def matrix_endpoint(reactor, destination, ssl_context_factory=None, if ssl_context_factory is None: transport_endpoint = TCP4ClientEndpoint - default_port = 8080 + default_port = 8008 else: transport_endpoint = SSL4ClientEndpoint endpoint_kw_args.update(sslContextFactory=ssl_context_factory) - default_port = 443 + default_port = 8448 if port is None: return SRVClientEndpoint( From e166e29e872d8f31a64ab9da7686c09021b47767 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 16:57:10 +0100 Subject: [PATCH 2/9] Bump version and changelog --- CHANGES.rst | 22 ++++++++++++++++++++++ UPGRADE.rst | 26 ++++++++++++++++++++++++++ VERSION | 2 +- synapse/__init__.py | 2 +- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index caad193b68..292f7eee62 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,25 @@ +Changes in synapse 0.2.0 (2014-09-02) +===================================== +This update changes many configuration options, updates the +database schema and mandates SSL for server-server connections. + +Homeserver: + * Require SSL for server-server connections. + * Add SSL listener for client-server connections. + * Add ability to use config files. + * Add support for kicking/banning and power levels. + * Allow setting of room names and topics on creation. + * Change presence to include last seen time of the user. + * Change url path prefix to /_matrix/... + * Bug fixes to presence. + +Webclient: + * Reskin the CSS for registration and login. + * Various improvements to rooms CSS. + * Support changes in client-server API. + * Bug fixes to VOIP UI. + * Various bug fixes to handling of changes to room member list. + Changes in synapse 0.1.2 (2014-08-29) ===================================== diff --git a/UPGRADE.rst b/UPGRADE.rst index 2e75d77bca..81624d5cdb 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -1,3 +1,29 @@ +Upgrading to v0.2.0 +=================== + +To upgrade the database schema, run:: + + ./database-prepare-for-0.2.0.sh ".db" + + +The home server npw requires setting up of SSL config before it can run. To +automatically generate some default config that can be edited use:: + + $ python synapse/app/homeserver.py \ + --server-name machine.my.domain.name \ + --bind-port 8448 \ + --config-path homeserver.config \ + --generate-config + +After editing the config, you can run the home server using:: + + $ python synapse/app/homeserver.py --config-path homeserver.config + +See the README.rst for more information. + +Also note that many config options have been renamed. + + Upgrading to v0.0.1 =================== diff --git a/VERSION b/VERSION index d917d3e26a..0ea3a944b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.2 +0.2.0 diff --git a/synapse/__init__.py b/synapse/__init__.py index 04200060bf..b45cf47b56 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.1.2" +__version__ = "0.2.0" From 211a8b288a87218f5d9cf458dd41fcefad17d7fc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 16:59:45 +0100 Subject: [PATCH 3/9] Hide the email textbox during registeration has it has not been wired up yet. --- webclient/login/register.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webclient/login/register.html b/webclient/login/register.html index 1b470e4554..81995f1ae0 100644 --- a/webclient/login/register.html +++ b/webclient/login/register.html @@ -12,8 +12,8 @@

- -
Specifying an email address lets other users find you on Matrix more easily,
+ +
From c2c3ee8e4ad24be784ede30f25dd591e5f9e931a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 17:01:04 +0100 Subject: [PATCH 4/9] Fix spelling --- UPGRADE.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index 81624d5cdb..d579383474 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -6,7 +6,7 @@ To upgrade the database schema, run:: ./database-prepare-for-0.2.0.sh ".db" -The home server npw requires setting up of SSL config before it can run. To +The home server now requires setting up of SSL config before it can run. To automatically generate some default config that can be edited use:: $ python synapse/app/homeserver.py \ From 731c33dd97f193bd27bd28510b64b42f214da48f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 17:06:08 +0100 Subject: [PATCH 5/9] Don't so heavily suggest you need to edit the default config. List the changed parameters. --- UPGRADE.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index d579383474..6083a5a326 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -7,7 +7,7 @@ To upgrade the database schema, run:: The home server now requires setting up of SSL config before it can run. To -automatically generate some default config that can be edited use:: +automatically generate the default config use:: $ python synapse/app/homeserver.py \ --server-name machine.my.domain.name \ @@ -15,13 +15,17 @@ automatically generate some default config that can be edited use:: --config-path homeserver.config \ --generate-config -After editing the config, you can run the home server using:: +This config can be edited if desired, for example to specify a different SSL +certificate to use. Once done you can run the home server using:: $ python synapse/app/homeserver.py --config-path homeserver.config See the README.rst for more information. -Also note that many config options have been renamed. +Also note that many config options have been renamed, including: + - "host" to "server-name" + - "database" to "database-path" + - "port" to "bind-port" and "unsecure-port" Upgrading to v0.0.1 From 18f02474911e6dc46e4553a5f3c1c9e50b75d1c5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 17:06:50 +0100 Subject: [PATCH 6/9] Remove an annoying 'the' --- UPGRADE.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index 6083a5a326..28a69d8d39 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -7,7 +7,7 @@ To upgrade the database schema, run:: The home server now requires setting up of SSL config before it can run. To -automatically generate the default config use:: +automatically generate default config use:: $ python synapse/app/homeserver.py \ --server-name machine.my.domain.name \ From 9a7f7cb74f061a6fa472dcfd74e694626de8b88e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 17:10:28 +0100 Subject: [PATCH 7/9] Try and remove annoying italics in github rst viewer --- UPGRADE.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index 28a69d8d39..a9c2b2539d 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -22,7 +22,8 @@ certificate to use. Once done you can run the home server using:: See the README.rst for more information. -Also note that many config options have been renamed, including: +Also note that some config options have been renamed, including: + - "host" to "server-name" - "database" to "database-path" - "port" to "bind-port" and "unsecure-port" From 47c7dd590dbdd3c619f228791197f41ab74e6b1e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 17:12:07 +0100 Subject: [PATCH 8/9] Un block quote list --- UPGRADE.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index a9c2b2539d..99d58ab64f 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -24,9 +24,9 @@ See the README.rst for more information. Also note that some config options have been renamed, including: - - "host" to "server-name" - - "database" to "database-path" - - "port" to "bind-port" and "unsecure-port" +- "host" to "server-name" +- "database" to "database-path" +- "port" to "bind-port" and "unsecure-port" Upgrading to v0.0.1 From d8a921f6a6cb63873656e13a9000d1f9cb161a0e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 2 Sep 2014 17:31:40 +0100 Subject: [PATCH 9/9] Add database upgrade script --- database-prepare-for-0.2.0.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 database-prepare-for-0.2.0.sh diff --git a/database-prepare-for-0.2.0.sh b/database-prepare-for-0.2.0.sh new file mode 100755 index 0000000000..e90171010b --- /dev/null +++ b/database-prepare-for-0.2.0.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# This is will prepare a synapse database for running with v0.2.0 of synapse. + +set -e + +cp "$1" "$1.bak" + +sqlite3 "$1" < "synapse/storage/schema/im.sql" +sqlite3 "$1" <<< "PRAGMA user_version = 2;"