diff --git a/CHANGES.md b/CHANGES.md
index ecba33bd30..cd23b8112b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.4.1 (2019-10-18)
+==========================
+
+No changes since 1.4.1rc1.
+
+
Synapse 1.4.1rc1 (2019-10-17)
=============================
diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index af102f7594..89c1518bd0 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -1,39 +1,26 @@
-# Synapse Docker
-
-FIXME: this is out-of-date as of
-https://github.com/matrix-org/synapse/issues/5518. Contributions to bring it up
-to date would be welcome.
-
-### Automated configuration
-
-It is recommended that you use Docker Compose to run your containers, including
-this image and a Postgres server. A sample ``docker-compose.yml`` is provided,
-including example labels for reverse proxying and other artifacts.
-
-Read the section about environment variables and set at least mandatory variables,
-then run the server:
-
-```
-docker-compose up -d
-```
-If secrets are not specified in the environment variables, they will be generated
-as part of the startup. Please ensure these secrets are kept between launches of the
-Docker container, as their loss may require users to log in again.
+# Synapse Docker
-### Manual configuration
+### Configuration
A sample ``docker-compose.yml`` is provided, including example labels for
reverse proxying and other artifacts. The docker-compose file is an example,
please comment/uncomment sections that are not suitable for your usecase.
Specify a ``SYNAPSE_CONFIG_PATH``, preferably to a persistent path,
-to use manual configuration. To generate a fresh ``homeserver.yaml``, simply run:
+to use manual configuration.
+
+To generate a fresh `homeserver.yaml`, you can use the `generate` command.
+(See the [documentation](../../docker/README.md#generating-a-configuration-file)
+for more information.) You will need to specify appropriate values for at least the
+`SYNAPSE_SERVER_NAME` and `SYNAPSE_REPORT_STATS` environment variables. For example:
```
-docker-compose run --rm -e SYNAPSE_SERVER_NAME=my.matrix.host synapse generate
+docker-compose run --rm -e SYNAPSE_SERVER_NAME=my.matrix.host -e SYNAPSE_REPORT_STATS=yes synapse generate
```
+(This will also generate necessary signing keys.)
+
Then, customize your configuration and run the server:
```
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 1e4ee43758..72c87054e5 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -15,13 +15,10 @@ services:
restart: unless-stopped
# See the readme for a full documentation of the environment settings
environment:
- - SYNAPSE_SERVER_NAME=my.matrix.host
- - SYNAPSE_REPORT_STATS=no
- - SYNAPSE_ENABLE_REGISTRATION=yes
- - SYNAPSE_LOG_LEVEL=INFO
- - POSTGRES_PASSWORD=changeme
+ - SYNAPSE_CONFIG_PATH=/etc/homeserver.yaml
volumes:
# You may either store all the files in a local folder
+ - ./matrix-config:/etc
- ./files:/data
# .. or you may split this between different storage points
# - ./files:/data
@@ -35,9 +32,23 @@ services:
- 8448:8448/tcp
# ... or use a reverse proxy, here is an example for traefik:
labels:
+ # The following lines are valid for Traefik version 1.x:
- traefik.enable=true
- traefik.frontend.rule=Host:my.matrix.Host
- traefik.port=8008
+ # Alternatively, for Traefik version 2.0:
+ - traefik.enable=true
+ - traefik.http.routers.http-synapse.entryPoints=http
+ - traefik.http.routers.http-synapse.rule=Host(`my.matrix.host`)
+ - traefik.http.middlewares.https_redirect.redirectscheme.scheme=https
+ - traefik.http.middlewares.https_redirect.redirectscheme.permanent=true
+ - traefik.http.routers.http-synapse.middlewares=https_redirect
+ - traefik.http.routers.https-synapse.entryPoints=https
+ - traefik.http.routers.https-synapse.rule=Host(`my.matrix.host`)
+ - traefik.http.routers.https-synapse.service=synapse
+ - traefik.http.routers.https-synapse.tls=true
+ - traefik.http.services.synapse.loadbalancer.server.port=8008
+ - traefik.http.routers.https-synapse.tls.certResolver=le-ssl
db:
image: docker.io/postgres:10-alpine
diff --git a/debian/changelog b/debian/changelog
index 60c682cc57..02f2b508c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.4.1) stable; urgency=medium
+
+ * New synapse release 1.4.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Fri, 18 Oct 2019 10:13:27 +0100
+
matrix-synapse-py3 (1.4.0) stable; urgency=medium
* New synapse release 1.4.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e908b90177..ee3313a41c 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
except ImportError:
pass
-__version__ = "1.4.1rc1"
+__version__ = "1.4.1"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when
|
