From 6f4b79b491f7579a9a8087ad67aa6a60a6e21295 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <christian.elberfeld@adesso.de>
Date: Fri, 8 May 2020 16:11:09 +0200
Subject: [PATCH] =?UTF-8?q?r=C3=BCckbau=20login=20workaround?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
webserver/docker_matrix/tasks/main.yml | 1 -
webserver/docker_matrix/templates/Dockerfile | 5 +----
.../synapse-data/synapse-1.9.0-ldap-fix.patch | 10 ----------
3 files changed, 1 insertion(+), 15 deletions(-)
delete mode 100644 webserver/docker_matrix/templates/synapse-data/synapse-1.9.0-ldap-fix.patch
diff --git a/webserver/docker_matrix/tasks/main.yml b/webserver/docker_matrix/tasks/main.yml
index 6d961148..6d58730c 100644
--- a/webserver/docker_matrix/tasks/main.yml
+++ b/webserver/docker_matrix/tasks/main.yml
@@ -29,7 +29,6 @@
- mxisd-config/mxisd.yaml
- synapse-data/homeserver.log.config
- synapse-data/homeserver.yaml
- - synapse-data/synapse-1.9.0-ldap-fix.patch
register: configs
diff --git a/webserver/docker_matrix/templates/Dockerfile b/webserver/docker_matrix/templates/Dockerfile
index 0f28cf67..a3b6c9c9 100644
--- a/webserver/docker_matrix/templates/Dockerfile
+++ b/webserver/docker_matrix/templates/Dockerfile
@@ -2,8 +2,5 @@ FROM matrixdotorg/synapse:v1.9.0-py3
RUN apk add curl
RUN export PYTHON_MINOR_VERSION=$(echo "${PYTHON_VERSION}" | rev | cut -d"." -f2- | rev) ; \
- curl https://raw.githubusercontent.com/kamax-matrix/matrix-synapse-rest-auth/master/rest_auth_provider.py -o /usr/local/lib/python${PYTHON_MINOR_VERSION}/site-packages/rest_auth_provider.py
+ curl https://raw.githubusercontent.com/ma1uta/matrix-synapse-rest-password-provider/master/rest_auth_provider.py -o /usr/local/lib/python${PYTHON_MINOR_VERSION}/site-packages/rest_auth_provider.py
-# Fix Synapse 1.9.0 Problem: https://github.com/matrix-org/synapse/issues/6772
-COPY synapse-data/synapse-1.9.0-ldap-fix.patch /synapse-1.9.0-ldap-fix.patch
-RUN cd /usr/local/lib/python3.7/site-packages/synapse/module_api && patch < /synapse-1.9.0-ldap-fix.patch
diff --git a/webserver/docker_matrix/templates/synapse-data/synapse-1.9.0-ldap-fix.patch b/webserver/docker_matrix/templates/synapse-data/synapse-1.9.0-ldap-fix.patch
deleted file mode 100644
index 45b0a13c..00000000
--- a/webserver/docker_matrix/templates/synapse-data/synapse-1.9.0-ldap-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- __init__.py
-+++ __init__.py
-@@ -37,6 +37,7 @@ class ModuleApi(object):
-
- def __init__(self, hs, auth_handler):
- self._hs = hs
-+ self.hs = hs
-
- self._store = hs.get_datastore()
- self._auth = hs.get_auth()
\ No newline at end of file
--
GitLab