Merge pull request #276 from ulope/release/2021.05.rc2

Release 2021.05.rc2

Author: fredo

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2021.05.0rc1
+current_version = 2021.05.0rc2
 commit = True
 tag = True
 tag_name = {new_version}

README.md

@@ -151,11 +151,11 @@ can identify this, if there is an `rcX` at the end of the version (E.g. `2019.03
 [latest full release](https://github.com/raiden-network/raiden-service-bundle/releases/latest). If the version is
 different from what you see below, you should stick to the "full release" and replace the version accordingly.
 
-1. Clone the [current release version of this repository](https://github.com/raiden-network/raiden-service-bundle/tree/2021.05.0rc1)
+1. Clone the [current release version of this repository](https://github.com/raiden-network/raiden-service-bundle/tree/2021.05.0rc2)
    to a suitable location on the server:
 
    ```shell
-   git clone -b 2021.05.0rc1 https://github.com/raiden-network/raiden-service-bundle.git
+   git clone -b 2021.05.0rc2 https://github.com/raiden-network/raiden-service-bundle.git
    ```
 1. Copy `.env.template` to `.env` and modify the values to fit your setup. Please read [Configuring the `.env` file](#configuring-the-env-file) for detailed information.
    - We would appreciate it if you allow us access to the monitoring interfaces

config/synapse/synapse.template.yaml

@@ -139,12 +139,6 @@ federation_metrics_domains:
 ${KNOWN_SERVERS}
 
 
-## API Configuration ##
-room_invite_state_types:
-  - "m.room.join_rules"
-  - "m.room.canonical_alias"
-  - "m.room.name"
-
 ## Room Creation Rules ##
 alias_creation_rules:
   - user_id: "*"

docker-compose.yml

@@ -5,11 +5,11 @@ x-versions:
   services: &IMAGE_RAIDEN_SERVICES_VERSION
     image: raidennetwork/raiden-services:v0.15.1
   db: &IMAGE_DB_VERSION
-    image: raidennetwork/raiden-service-bundle:2021.05.0rc1-db
+    image: raidennetwork/raiden-service-bundle:2021.05.0rc2-db
   synapse: &IMAGE_SYNAPSE_VERSION
-    image: raidennetwork/raiden-service-bundle:2021.05.0rc1-synapse
+    image: raidennetwork/raiden-service-bundle:2021.05.0rc2-synapse
   well-known-server: &IMAGE_WELL_KNOWN_VERSION
-    image: raidennetwork/raiden-service-bundle:2021.05.0rc1-well_known_server
+    image: raidennetwork/raiden-service-bundle:2021.05.0rc2-well_known_server
   redis: &IMAGE_REDIS_VERSION
     image: redis:6.0
   metrics_db: &IMAGE_METRICS_DB_VERSION
@@ -21,7 +21,7 @@ x-versions:
   node_exporter: &IMAGE_NODE_EXPORTER
     image: quay.io/prometheus/node-exporter:v1.0.1
   compress_state: &IMAGE_COMPRESS_STATE
-    image: raidennetwork/raiden-service-bundle:2021.05.0rc1-rust_synapse_compress_state
+    image: raidennetwork/raiden-service-bundle:2021.05.0rc2-rust_synapse_compress_state
 # /versions
 
 x-defaults: &services-defaults
@@ -148,11 +148,11 @@ services:
       - "traefik.http.routers.synapse.rule=Host(`transport.${SERVER_NAME}`)"
       - "traefik.http.routers.synapse.tls=true"
       - "traefik.http.routers.synapse.tls.certresolver=le"
-      - "traefik.http.routers.synapse.middlewares=tls-headers-middleware"
+      - "traefik.http.routers.synapse.middlewares=tls-headers-middleware@docker"
       - "traefik.http.routers.synapse.service=synapse"
       - "traefik.http.services.synapse.loadbalancer.server.port=8008"
       - "traefik.http.services.synapse.loadbalancer.healthcheck.path=/_matrix/client/versions"
-      - "traefik.http.middlewares.tls-headers-middleware.headers.sslProxyHeaders=true"
+      - "traefik.http.middlewares.tls-headers-middleware.headers.customrequestheaders.X-Forwarded-Proto=https"
       - "traefik.http.routers.metrics.rule=Host(`metrics.transport.${SERVER_NAME}`)"
       - "traefik.http.routers.metrics.tls=true"
       - "traefik.http.routers.metrics.tls.certresolver=le"