From 23bd79debc282bb8f010ef263aee8dc6c4561e78 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 2 Sep 2022 06:45:11 +0000 Subject: [PATCH 1/4] Upgrade to v0.9.6 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index b5c448b..ba7775e 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.9.5 -SOURCE_SUM=222c1dec7ea18f7f0d86651112933abb25738ef0c9493757569d5dc4301b0813 +SOURCE_URL=https://api.github.com/repos/matrix-org/dendrite/tarball/v0.9.6 +SOURCE_SUM=b300e5f5da28872af08aade0868c132d81c2707edd6c3e9cd76a136292795c72 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 50dc6cc..b693748 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.9.5~ynh1", + "version": "0.9.6~ynh1", "url": "https://matrix.org/", "upstream": { "license": "Apache-2.0", From 364b4738562b5a3fec38c270698a11eee9a69b25 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 2 Sep 2022 06:45:17 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c059069..7d0f13e 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.9.5~ynh1 +**Shipped version:** 0.9.6~ynh1 ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 976311a..9b8a5db 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.9.5~ynh1 +**Version incluse :** 0.9.6~ynh1 ## Avertissements / informations importantes From 8123b8135291891a5b7ddf804a6eb46b41f6e8b8 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 4 Sep 2022 09:53:37 +0200 Subject: [PATCH 3/4] Fix server_name --- conf/dendrite.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/dendrite.yaml b/conf/dendrite.yaml index df29574..5e02c0b 100644 --- a/conf/dendrite.yaml +++ b/conf/dendrite.yaml @@ -33,7 +33,7 @@ version: 2 # Global Matrix configuration. This configuration applies to all components. global: # The domain name of this homeserver. - server_name: __DOMAIN__ + server_name: __SERVER_NAME__ # The path to the signing private key file, used to sign requests and events. # Note that this is NOT the same private key as used for TLS! To generate a From dd99fae137c9d6af6f717b16aad4d005b1567955 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 4 Sep 2022 10:04:34 +0200 Subject: [PATCH 4/4] Fix service stopping detection --- scripts/change_url | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 8e07094..ccae504 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="systemd" +ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped Dendrite Matrix homeserver" --log_path="/var/log/$app/Monolith.log" #================================================= # MODIFY URL IN NGINX CONF diff --git a/scripts/upgrade b/scripts/upgrade index 8019612..4467f3c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,7 +57,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="systemd" +ynh_systemd_action --service_name=$app --action="stop" --line_match="Stopped external Monolith listener" --log_path="/var/log/$app/Monolith.log" #================================================= # ENSURE DOWNWARD COMPATIBILITY