Skip to content
Snippets Groups Projects
Commit 25aee7d3 authored by Christian Elberfeld's avatar Christian Elberfeld
Browse files

Fix Synapse 1.9.0 Upgrade problem: https://github.com/matrix-org/synapse/issues/6772

parent 1f02a079
No related branches found
No related tags found
No related merge requests found
...@@ -29,16 +29,17 @@ ...@@ -29,16 +29,17 @@
- mxisd-config/mxisd.yaml - mxisd-config/mxisd.yaml
- synapse-data/homeserver.log.config - synapse-data/homeserver.log.config
- synapse-data/homeserver.yaml - synapse-data/homeserver.yaml
- synapse-data/synapse-1.9.0-ldap-fix.patch
register: configs register: configs
- name: stop matrix docker - name: stop matrix docker
docker_service: docker_compose:
project_src: /srv/matrix/ project_src: /srv/matrix/
state: absent state: absent
when: configs.changed when: configs.changed
- name: start matrix docker - name: start matrix docker
docker_service: docker_compose:
project_src: /srv/matrix/ project_src: /srv/matrix/
state: present state: present
...@@ -3,3 +3,7 @@ FROM matrixdotorg/synapse:v1.9.0-py3 ...@@ -3,3 +3,7 @@ FROM matrixdotorg/synapse:v1.9.0-py3
RUN apk add curl RUN apk add curl
RUN export PYTHON_MINOR_VERSION=$(echo "${PYTHON_VERSION}" | rev | cut -d"." -f2- | rev) ; \ 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/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
# 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
...@@ -30,7 +30,8 @@ services: ...@@ -30,7 +30,8 @@ services:
SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml" SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml"
mxisd: mxisd:
# TODO: Migrate to https://github.com/ma1uta/ma1sd
image: kamax/mxisd:1.4.6 image: kamax/mxisd:1.4.6
restart: always restart: always
ports: ports:
......
--- __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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment