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

Update to 1.12.0

Browse Source
This commit is contained in:
Matthias
2020-03-29 13:55:56 +02:00
parent 5f773b9514
commit 3c8b86252d
4 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -92,3 +92,5 @@
[0.3.8] [0.3.8]
* Update to synapse v1.11.0 * Update to synapse v1.11.0
[0.4.0]
* Update to synapse v1.12.0

4
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.3.8", "version": "0.4.0",
"healthCheckPath": "/", "healthCheckPath": "/",
"httpPort": 8000, "httpPort": 8000,
"memoryLimit": 536870912, "memoryLimit": 536870912,
@@ -34,7 +34,7 @@
"postgresql": {}, "postgresql": {},
"sendmail": {} "sendmail": {}
}, },
"manifestVersion": 1, "manifestVersion": 2,
"website": "https://matrix.org", "website": "https://matrix.org",
"contactEmail": "support@cloudron.io", "contactEmail": "support@cloudron.io",
"icon": "logo.png", "icon": "logo.png",

2
Dockerfile
View File

@@ -6,7 +6,7 @@ RUN mkdir -p /app/code/nginx
WORKDIR /app/code WORKDIR /app/code
ENV MATRIXVERSION=v1.11.0 ENV MATRIXVERSION=v1.12.0
EXPOSE 8000 EXPOSE 8000
EXPOSE 3478/udp EXPOSE 3478/udp

50
start_matrix.sh
View File

@@ -18,7 +18,7 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
# ln -sf /app/data/appservice/appservice-registration-webhooks.yaml /app/data/synapse/appservice-registration-webhooks.yaml # ln -sf /app/data/appservice/appservice-registration-webhooks.yaml /app/data/synapse/appservice-registration-webhooks.yaml
# create certs # create certs
openssl req -new -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -out /app/data/synapse/${APP_DOMAIN}.tls.crt -keyout /app/data/synapse/${APP_DOMAIN}.tls.key -subj "/C=DE/ST=Germany/L=Germany/O=Example/OU=Example/CN=${APP_DOMAIN}" openssl req -new -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -out /app/data/synapse/${CLOUDRON_APP_DOMAIN}.tls.crt -keyout /app/data/synapse/${CLOUDRON_APP_DOMAIN}.tls.key -subj "/C=DE/ST=Germany/L=Germany/O=Example/OU=Example/CN=${CLOUDRON_APP_DOMAIN}"
# fix permissions # fix permissions
chown -R www-data.www-data /run/synapse \ chown -R www-data.www-data /run/synapse \
@@ -36,34 +36,34 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
cd /app/data/synapse cd /app/data/synapse
python3 -m synapse.app.homeserver \ python3 -m synapse.app.homeserver \
--server-name ${APP_DOMAIN} \ --server-name ${CLOUDRON_APP_DOMAIN} \
--config-path homeserver.yaml \ --config-path homeserver.yaml \
--report-stats=no \ --report-stats=no \
--generate-config --generate-config
# synapse config # synapse config
sed -i "s/server_name:.*/server_name: ${APP_DOMAIN}/" homeserver.yaml sed -i "s/server_name:.*/server_name: ${CLOUDRON_APP_DOMAIN}/" homeserver.yaml
sed -i "s/#public_baseurl:.*/public_baseurl: https:\/\/${APP_DOMAIN}/" homeserver.yaml sed -i "s/#public_baseurl:.*/public_baseurl: https:\/\/${CLOUDRON_APP_DOMAIN}/" homeserver.yaml
sed -i "s/web_client:.*/web_client: False/" homeserver.yaml sed -i "s/web_client:.*/web_client: False/" homeserver.yaml
sed -i "s/bind_addresses: \['::1'.*/bind_addresses: \['0.0.0.0'\]/" homeserver.yaml sed -i "s/bind_addresses: \['::1'.*/bind_addresses: \['0.0.0.0'\]/" homeserver.yaml
sed -i "s/sqlite3/psycopg2/" homeserver.yaml sed -i "s/sqlite3/psycopg2/" homeserver.yaml
sed -i "s/ database: .*/ user: ${POSTGRESQL_USERNAME}\n password: ${POSTGRESQL_PASSWORD}\n database: ${POSTGRESQL_DATABASE}\n host: ${POSTGRESQL_HOST}\n cp_min: 5\n cp_max: 10/" homeserver.yaml sed -i "s/ database: .*/ user: ${CLOUDRON_POSTGRESQL_USERNAME}\n password: ${CLOUDRON_POSTGRESQL_PASSWORD}\n database: ${CLOUDRON_POSTGRESQL_DATABASE}\n host: ${CLOUDRON_POSTGRESQL_HOST}\n cp_min: 5\n cp_max: 10/" homeserver.yaml
sed -i "s/#enable_registration:.*/enable_registration: True/" homeserver.yaml sed -i "s/#enable_registration:.*/enable_registration: True/" homeserver.yaml
sed -i "s/#password_providers:/password_providers:/" homeserver.yaml sed -i "s/#password_providers:/password_providers:/" homeserver.yaml
sed -i 's/# - module: "ldap_auth_provider.LdapAuthProvider"/ - module: "ldap_auth_provider.LdapAuthProvider"/' homeserver.yaml sed -i 's/# - module: "ldap_auth_provider.LdapAuthProvider"/ - module: "ldap_auth_provider.LdapAuthProvider"/' homeserver.yaml
sed -i 's/# config:/ config:/' homeserver.yaml sed -i 's/# config:/ config:/' homeserver.yaml
sed -i 's/# enabled: true/ enabled: true/' homeserver.yaml sed -i 's/# enabled: true/ enabled: true/' homeserver.yaml
sed -i "s,# uri: .*, uri: \"${LDAP_URL}\"," homeserver.yaml sed -i "s,# uri: .*, uri: \"${CLOUDRON_LDAP_URL}\"," homeserver.yaml
sed -i 's/# start_tls: true/ start_tls: false/' homeserver.yaml sed -i 's/# start_tls: true/ start_tls: false/' homeserver.yaml
sed -i 's/# base: "ou=users,dc=example,dc=com"/ base: "ou=users,dc=cloudron"/' homeserver.yaml sed -i 's/# base: "ou=users,dc=example,dc=com"/ base: "ou=users,dc=cloudron"/' homeserver.yaml
sed -i 's/# attributes:/ attributes:/' homeserver.yaml sed -i 's/# attributes:/ attributes:/' homeserver.yaml
sed -i 's/# uid: "cn"/ uid: "username"/' homeserver.yaml sed -i 's/# uid: "cn"/ uid: "username"/' homeserver.yaml
sed -i 's/# mail: "email"/ mail: "mail"/' homeserver.yaml sed -i 's/# mail: "email"/ mail: "mail"/' homeserver.yaml
sed -i 's/# name: "givenName"/ name: "username"/' homeserver.yaml sed -i 's/# name: "givenName"/ name: "username"/' homeserver.yaml
sed -i 's/#max_upload_size:.*/max_upload_size: "100M"/' homeserver.yaml sed -i 's/#max_upload_size:.*/max_upload_size: "500M"/' homeserver.yaml
sed -i 's/#auto_join_rooms:/auto_join_rooms:/' homeserver.yaml sed -i 's/#auto_join_rooms:/auto_join_rooms:/' homeserver.yaml
sed -i 's/# - "#example:example.com"/ - "#example:example.com"/' homeserver.yaml sed -i 's/# - "#example:example.com"/ - "#example:example.com"/' homeserver.yaml
sed -i "s/example:example.com/discuss:${APP_DOMAIN}/" homeserver.yaml sed -i "s/example:example.com/discuss:${CLOUDRON_APP_DOMAIN}/" homeserver.yaml
sed -i "s/turn_allow_guests:.*/turn_allow_guests: False/" homeserver.yaml sed -i "s/turn_allow_guests:.*/turn_allow_guests: False/" homeserver.yaml
sed -i "s/enable_group_creation:.*/enable_group_creation: True/" homeserver.yaml sed -i "s/enable_group_creation:.*/enable_group_creation: True/" homeserver.yaml
sed -i "s/enable_group_creation:.*/enable_group_creation: True/" homeserver.yaml sed -i "s/enable_group_creation:.*/enable_group_creation: True/" homeserver.yaml
@@ -91,12 +91,12 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
# coturn # coturn
TURNPWD=$(pwgen -s 64 1) TURNPWD=$(pwgen -s 64 1)
sed -i "s/#tls-listening-port=5349/tls-listening-port=3478/" /app/data/turnserver.conf sed -i "s/#tls-listening-port=5349/tls-listening-port=3478/" /app/data/turnserver.conf
sed -i "s/#realm=mycompany.org/realm=${APP_DOMAIN}/" /app/data/turnserver.conf sed -i "s/#realm=mycompany.org/realm=${CLOUDRON_APP_DOMAIN}/" /app/data/turnserver.conf
sed -i "s/#lt-cred-mech/lt-cred-mech/" /app/data/turnserver.conf sed -i "s/#lt-cred-mech/lt-cred-mech/" /app/data/turnserver.conf
sed -i "s/#use-auth-secret/use-auth-secret/" /app/data/turnserver.conf sed -i "s/#use-auth-secret/use-auth-secret/" /app/data/turnserver.conf
sed -i "s/#lt-cred-mech/lt-cred-mech/" /app/data/turnserver.conf sed -i "s/#lt-cred-mech/lt-cred-mech/" /app/data/turnserver.conf
sed -i "s/#static-auth-secret=.*/static-auth-secret=${TURNPWD}/" /app/data/turnserver.conf sed -i "s/#static-auth-secret=.*/static-auth-secret=${TURNPWD}/" /app/data/turnserver.conf
sed -i "s/#turn_uris: .*/turn_uris: [\"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=udp\", \"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=tcp\"]/" homeserver.yaml sed -i "s/#turn_uris: .*/turn_uris: [\"turn:${CLOUDRON_APP_DOMAIN}:${TURN_TLS_PORT}?transport=udp\", \"turn:${CLOUDRON_APP_DOMAIN}:${TURN_TLS_PORT}?transport=tcp\"]/" homeserver.yaml
sed -i "s/#turn_shared_secret: .*/turn_shared_secret: \"${TURNPWD}\"/" homeserver.yaml sed -i "s/#turn_shared_secret: .*/turn_shared_secret: \"${TURNPWD}\"/" homeserver.yaml
sed -i "s/#cipher-list=.*/cipher-list=\"HIGH\"/" /app/data/turnserver.conf sed -i "s/#cipher-list=.*/cipher-list=\"HIGH\"/" /app/data/turnserver.conf
sed -i "s/#log-file=.*/log-file=\/run\/turn_log\/turn.log/" /app/data/turnserver.conf sed -i "s/#log-file=.*/log-file=\/run\/turn_log\/turn.log/" /app/data/turnserver.conf
@@ -113,12 +113,12 @@ if [[ ! -f /app/data/synapse/homeserver.yaml ]]; then
# set up email # set up email
sed -i 's/#email:/email:/' homeserver.yaml sed -i 's/#email:/email:/' homeserver.yaml
sed -i 's/# enable_notifs: false/ enable_notifs: true/' homeserver.yaml sed -i 's/# enable_notifs: false/ enable_notifs: true/' homeserver.yaml
sed -i 's/# smtp_host: \"localhost\"/ smtp_host: \"${MAIL_SMTP_SERVER}\"/' homeserver.yaml sed -i 's/# smtp_host: \"localhost\"/ smtp_host: \"${CLOUDRON_MAIL_SMTP_SERVER}\"/' homeserver.yaml
sed -i 's/# smtp_port: .*/ smtp_port: ${MAIL_SMTP_PORT}/' homeserver.yaml sed -i 's/# smtp_port: .*/ smtp_port: ${CLOUDRON_MAIL_SMTP_PORT}/' homeserver.yaml
sed -i 's/# smtp_user: \"exampleusername\"/ smtp_user: \"${MAIL_SMTP_USERNAME}\"/' homeserver.yaml sed -i 's/# smtp_user: \"exampleusername\"/ smtp_user: \"${CLOUDRON_MAIL_SMTP_USERNAME}\"/' homeserver.yaml
sed -i 's/# smtp_pass: \"examplepassword\"/ smtp_pass: \"${MAIL_SMTP_PASSWORD}\"/' homeserver.yaml sed -i 's/# smtp_pass: \"examplepassword\"/ smtp_pass: \"${CLOUDRON_MAIL_SMTP_PASSWORD}\"/' homeserver.yaml
sed -i 's/# require_transport_security: False/ require_transport_security: false/' homeserver.yaml sed -i 's/# require_transport_security: False/ require_transport_security: false/' homeserver.yaml
sed -i "s/# notif_from: .*/ notif_from: \"Your Friendly Matrix Home Server <${MAIL_FROM}>\"/" homeserver.yaml sed -i "s/# notif_from: .*/ notif_from: \"Your Friendly Matrix Home Server <${CLOUDRON_MAIL_FROM}>\"/" homeserver.yaml
sed -i 's/# app_name: Matrix/ app_name: Matrix/' homeserver.yaml sed -i 's/# app_name: Matrix/ app_name: Matrix/' homeserver.yaml
sed -i 's/# notif_template_html: .*/ notif_template_html: notif_mail.html/' homeserver.yaml sed -i 's/# notif_template_html: .*/ notif_template_html: notif_mail.html/' homeserver.yaml
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
@@ -138,26 +138,26 @@ cd /app/data/synapse
# check if TURN port has changed and update it # check if TURN port has changed and update it
if [ -z ${TURN_TLS_PORT+x} ]; then TURN_TLS_PORT="3478"; fi if [ -z ${TURN_TLS_PORT+x} ]; then TURN_TLS_PORT="3478"; fi
sed -i "s/turn_uris: .*/turn_uris: [\"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=udp\", \"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=tcp\"]/" homeserver.yaml sed -i "s/turn_uris: .*/turn_uris: [\"turn:${CLOUDRON_APP_DOMAIN}:${TURN_TLS_PORT}?transport=udp\", \"turn:${CLOUDRON_APP_DOMAIN}:${TURN_TLS_PORT}?transport=tcp\"]/" homeserver.yaml
sed -i "s/tls-listening-port=.*/tls-listening-port=${TURN_TLS_PORT}/" /app/data/turnserver.conf sed -i "s/tls-listening-port=.*/tls-listening-port=${TURN_TLS_PORT}/" /app/data/turnserver.conf
# check if certificate changed and update fingerprint # check if certificate changed and update fingerprint
TLS_FINGERPRINT=$(openssl s_client -connect ${APP_DOMAIN}:${TURN_TLS_PORT} < /dev/null 2> /dev/null | openssl x509 -outform DER | openssl sha256 -binary | base64 | tr -d '=') TLS_FINGERPRINT=$(openssl s_client -connect ${CLOUDRON_APP_DOMAIN}:${TURN_TLS_PORT} < /dev/null 2> /dev/null | openssl x509 -outform DER | openssl sha256 -binary | base64 | tr -d '=')
sed -i "s,^tls_fingerprints:.*,tls_fingerprints: [{sha256: \"${TLS_FINGERPRINT}\"}]," homeserver.yaml sed -i "s,^tls_fingerprints:.*,tls_fingerprints: [{sha256: \"${TLS_FINGERPRINT}\"}]," homeserver.yaml
gosu www-data turnserver -c /app/data/turnserver.conf --daemon -v gosu www-data turnserver -c /app/data/turnserver.conf --daemon -v
# update user and pass in case they changed # update user and pass in case they changed
sed -i "s/ user: .*/ user: ${POSTGRESQL_USERNAME}/" homeserver.yaml sed -i "s/ user: .*/ user: ${CLOUDRON_POSTGRESQL_USERNAME}/" homeserver.yaml
sed -i "s/ password: .*/ password: ${POSTGRESQL_PASSWORD}/" homeserver.yaml sed -i "s/ password: .*/ password: ${CLOUDRON_POSTGRESQL_PASSWORD}/" homeserver.yaml
sed -i "s/ database: .*/ database: ${POSTGRESQL_DATABASE}/" homeserver.yaml sed -i "s/ database: .*/ database: ${CLOUDRON_POSTGRESQL_DATABASE}/" homeserver.yaml
sed -i "s, uri: .*, uri: \"${LDAP_URL}\"," homeserver.yaml sed -i "s, uri: .*, uri: \"${CLOUDRON_LDAP_URL}\"," homeserver.yaml
#update email settings in case they changed #update email settings in case they changed
sed -i "s/ smtp_host:.*/ smtp_host: \"${MAIL_SMTP_SERVER}\"/" homeserver.yaml sed -i "s/ smtp_host:.*/ smtp_host: \"${CLOUDRON_MAIL_SMTP_SERVER}\"/" homeserver.yaml
sed -i "s/ smtp_port:.*/ smtp_port: ${MAIL_SMTP_PORT}/" homeserver.yaml sed -i "s/ smtp_port:.*/ smtp_port: ${CLOUDRON_MAIL_SMTP_PORT}/" homeserver.yaml
sed -i "s/ smtp_user:.*/ smtp_user: \"${MAIL_SMTP_USERNAME}\"/" homeserver.yaml sed -i "s/ smtp_user:.*/ smtp_user: \"${CLOUDRON_MAIL_SMTP_USERNAME}\"/" homeserver.yaml
sed -i "s/ smtp_pass:.*/ smtp_pass: \"${MAIL_SMTP_PASSWORD}\"/" homeserver.yaml sed -i "s/ smtp_pass:.*/ smtp_pass: \"${CLOUDRON_MAIL_SMTP_PASSWORD}\"/" homeserver.yaml
gosu www-data python3 -m synapse.app.homeserver --config-path homeserver.yaml &> /dev/null & gosu www-data python3 -m synapse.app.homeserver --config-path homeserver.yaml &> /dev/null &