diff --git a/README.md b/README.md index 416f650..a3e224e 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments. -**Shipped version:** 0.10.3~ynh1 +**Shipped version:** 0.10.4~ynh1 ## Disclaimers / important information :warning: The upstream app is still in beta. Tread carefully. diff --git a/README_fr.md b/README_fr.md index 7e5b3cf..f95960d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p - Scalable: can run on multiple machines and eventually scale to massive homeserver deployments. -**Version incluse :** 0.10.3~ynh1 +**Version incluse :** 0.10.4~ynh1 ## Avertissements / informations importantes :warning: The upstream app is still in beta. Tread carefully. diff --git a/conf/app.src b/conf/app.src index 4dc4ff6..dd55c8c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://api.github.com/repos/matrix-org/dendrite/tarball/v0.10.3 -SOURCE_SUM=b85ca6bf2cad4e9e76875e7bcbee453e1917865ed93183cd8acd5eacd38f6320 +SOURCE_URL=https://api.github.com/repos/matrix-org/dendrite/tarball/v0.10.4 +SOURCE_SUM=2f0643b2b70100ce38956d3e423f42784958c51bb04622629fdd21111855ff83 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/dendrite.yaml b/conf/dendrite.yaml index 8bbde43..1f1f052 100644 --- a/conf/dendrite.yaml +++ b/conf/dendrite.yaml @@ -37,7 +37,7 @@ global: # you must configure the "database" block for each component instead. database: connection_string: postgres://__DB_USER__:__DB_PWD__@localhost/__DB_NAME__?sslmode=disable - max_open_conns: 100 + max_open_conns: 80 max_idle_conns: 5 conn_max_lifetime: -1 diff --git a/conf/server_name.conf b/conf/server_name.conf index 5f827c2..e03481c 100644 --- a/conf/server_name.conf +++ b/conf/server_name.conf @@ -7,8 +7,6 @@ location /.well-known/matrix/server { location /.well-known/matrix/client { return 200 '{ "m.homeserver": { "base_url": "https://__DOMAIN__" }, -# "im.vector.riot.jitsi": {"preferredDomain": "##JITSI_SERVER__"}, -# "im.vector.riot.e2ee": {"default": ##E2E_ENABLED_BY_DEFAULT__ } }'; add_header Content-Type application/json; add_header Access-Control-Allow-Origin '*'; diff --git a/manifest.json b/manifest.json index 15ee7a6..7179459 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Matrix homeserver of second generation", "fr": "Serveur Matrix de seconde génération" }, - "version": "0.10.3~ynh1", + "version": "0.10.4~ynh1", "url": "https://matrix.org/", "upstream": { "license": "Apache-2.0", diff --git a/scripts/change_url b/scripts/change_url index ccae504..334bd88 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -89,7 +89,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped Dendrite Matrix homeserver" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="stop" --line_match="Dendrite is exiting now" --log_path="/var/log/$app/Monolith.log" #================================================= # MODIFY URL IN NGINX CONF diff --git a/scripts/upgrade b/scripts/upgrade index 397dbb5..4715f07 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,7 +56,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped external Monolith listener" --log_path="/var/log/$app/Monolith.log" +ynh_systemd_action --service_name=$app --action="stop" --line_match="Dendrite is exiting now" --log_path="/var/log/$app/Monolith.log" #================================================= # ENSURE DOWNWARD COMPATIBILITY