andreas/synapse-app-mas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed federation

Browse Source
This commit is contained in:
Matthias
2019-07-03 17:26:59 +02:00
parent ad1d4b3c4a
commit 84eb87eb0b
6 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@@ -49,3 +49,6 @@
* Update to synapse v1.0.0 * Update to synapse v1.0.0
* Fixed url preview * Fixed url preview
* Fixed voip * Fixed voip
[0.2.4]
* Fixed federation

2
CloudronManifest.json
View File

@@ -5,7 +5,7 @@
"description": "file://DESCRIPTION.md", "description": "file://DESCRIPTION.md",
"changelog": "file://CHANGELOG", "changelog": "file://CHANGELOG",
"tagline": "standalone matrix server", "tagline": "standalone matrix server",
"version": "0.2.3", "version": "0.2.4",
"healthCheckPath": "/", "healthCheckPath": "/",
"httpPort": 8000, "httpPort": 8000,
"memoryLimit": 536870912, "memoryLimit": 536870912,

2
Dockerfile
View File

@@ -38,6 +38,8 @@ RUN pip3 install --upgrade setuptools
RUN pip3 install psycopg2-binary python-ldap matrix-synapse-ldap3 lxml netaddr twisted jinja2 bleach bcrypt RUN pip3 install psycopg2-binary python-ldap matrix-synapse-ldap3 lxml netaddr twisted jinja2 bleach bcrypt
RUN pip3 install https://github.com/matrix-org/synapse/archive/${MATRIXVERSION}.tar.gz RUN pip3 install https://github.com/matrix-org/synapse/archive/${MATRIXVERSION}.tar.gz
COPY index.html /app/code/nginx
RUN chown -R www-data.www-data /app/code RUN chown -R www-data.www-data /app/code
ADD start_matrix.sh /app/ ADD start_matrix.sh /app/

1
index.html Normal file
View File

@@ -0,0 +1 @@
<p>hi!</p>

13
nginx_matrix.conf
View File

@@ -5,17 +5,16 @@ server {
server_name _; server_name _;
# required, else the limit is 1mb # required, else the limit is 1mb
client_max_body_size 20M; client_max_body_size 200M;
# location /_matrix {
# proxy_pass http://localhost:8448;
# proxy_set_header X-Forwarded-For $remote_addr;
# }
location / { location / {
proxy_pass http://localhost:8008; proxy_pass http://localhost:8008;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
} }
} location /.well-known/matrix/server {
return 200 '{"m.server": "$host:443"}';
add_header Content-Type application/json;
}
}

18
start_matrix.sh
View File

@@ -65,15 +65,16 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
sed -i "s/#url_preview_enabled:.*/url_preview_enabled: true/" homeserver.yaml sed -i "s/#url_preview_enabled:.*/url_preview_enabled: true/" homeserver.yaml
sed -i "s/#url_preview_ip_range_blacklist.*/url_preview_ip_range_blacklist:\n - '127.0.0.0\/8'\n - '10.0.0.0\/8'/" homeserver.yaml sed -i "s/#url_preview_ip_range_blacklist.*/url_preview_ip_range_blacklist:\n - '127.0.0.0\/8'\n - '10.0.0.0\/8'/" homeserver.yaml
sed -i "s/## Server ##/## Server ##\n\nno_tls: True/" homeserver.yaml
# also enable the tls port, not quite sure why this is needed, but without it, no integratiosn are possible # also enable the tls port, not quite sure why this is needed, but without it, no integratiosn are possible
sed -i "s/#- port: 8448/- port: 8448/" homeserver.yaml #sed -i "s/#- port: 8448/- port: 8448/" homeserver.yaml
sed -i "s/# type: http/ type: http/" homeserver.yaml #sed -i "s/# type: http/ type: http/" homeserver.yaml
sed -i "s/# tls: true/ tls: true/" homeserver.yaml #sed -i "s/# tls: true/ tls: true/" homeserver.yaml
sed -i "s/# resources:/ resources:/" homeserver.yaml #sed -i "s/# resources:/ resources:/" homeserver.yaml
sed -i "s/# - names: \[client, federation\]/ - names: \[client, federation\]/" homeserver.yaml #sed -i "s/# - names: \[client, federation\]/ - names: \[client, federation\]/" homeserver.yaml
sed -i "s/#tls_certificate_path:/tls_certificate_path:/" homeserver.yaml #sed -i "s/#tls_certificate_path:/tls_certificate_path:/" homeserver.yaml
sed -i "s/#tls_private_key_path:/tls_private_key_path:/" homeserver.yaml #sed -i "s/#tls_private_key_path:/tls_private_key_path:/" homeserver.yaml
# get synapse log name and set path # get synapse log name and set path
@@ -118,6 +119,9 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
sed -i 's/# notif_template_text: .*/ notif_template_text: notif_mail.txt/' homeserver.yaml sed -i 's/# notif_template_text: .*/ notif_template_text: notif_mail.txt/' homeserver.yaml
sed -i 's/# notif_for_new_users: True/ notif_for_new_users: True/' homeserver.yaml sed -i 's/# notif_for_new_users: True/ notif_for_new_users: True/' homeserver.yaml
sed -i "s,#tls_fingerprints:.*,tls_fingerprints: [{sha256: \"${TLS_FINGERPRINT}\"}]," homeserver.yaml
fi fi
# logs # logs