From c20e88c3ae9bd497f7725762ec721cc60a99c100 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 5 Nov 2022 06:29:33 +0000 Subject: [PATCH 1/4] Upgrade to v0.10.7 --- 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 dd55c8c..3fd5ef9 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.4 -SOURCE_SUM=2f0643b2b70100ce38956d3e423f42784958c51bb04622629fdd21111855ff83 +SOURCE_URL=https://api.github.com/repos/matrix-org/dendrite/tarball/v0.10.7 +SOURCE_SUM=bd0b2ffe97e831442b7d4a4f175a63612a55b087929c88cc737871d7b78f1f30 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7179459..2805486 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.4~ynh1", + "version": "0.10.7~ynh1", "url": "https://matrix.org/", "upstream": { "license": "Apache-2.0", From a912a071e47e130207ef0bf8e13e01335486aac8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 5 Nov 2022 06:29:38 +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 a3e224e..9440f9a 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.4~ynh1 +**Shipped version:** 0.10.7~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 f95960d..75d69ac 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.4~ynh1 +**Version incluse :** 0.10.7~ynh1 ## Avertissements / informations importantes :warning: The upstream app is still in beta. Tread carefully. From a5c1829c855d854564cf7727e27b29ac18d93a86 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 12 Nov 2022 12:02:34 +0100 Subject: [PATCH 3/4] Update dendrite.yaml --- conf/dendrite.yaml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/conf/dendrite.yaml b/conf/dendrite.yaml index 1f1f052..ed247c7 100644 --- a/conf/dendrite.yaml +++ b/conf/dendrite.yaml @@ -18,12 +18,17 @@ global: private_key: matrix_key.pem # The paths and expiry timestamps (as a UNIX timestamp in millisecond precision) - # to old signing private keys that were formerly in use on this domain. These + # to old signing keys that were formerly in use on this domain name. These # keys will not be used for federation request or event signing, but will be # provided to any other homeserver that asks when trying to verify old events. old_private_keys: + # If the old private key file is available: # - private_key: old_matrix_key.pem # expired_at: 1601024554498 + # If only the public key (in base64 format) and key ID are known: + # - public_key: mn59Kxfdq9VziYHSBzI7+EDPDcBS2Xl7jeUdiiQcOnM= + # key_id: ed25519:mykeyid + # expired_at: 1601024554498 # How long a remote server can cache our server signing key before requesting it # again. Increasing this number will reduce the number of requests made by other @@ -138,7 +143,7 @@ global: dns_cache: enabled: true cache_size: 4096 - cache_lifetime: "10m" # 5 minutes; https://pkg.go.dev/time@master#ParseDuration + cache_lifetime: "10m" # 10 minutes; https://pkg.go.dev/time@master#ParseDuration # Configuration for the Appservice API. app_service_api: @@ -176,6 +181,12 @@ client_api: recaptcha_bypass_secret: "" recaptcha_siteverify_api: "" + # To use hcaptcha.com instead of ReCAPTCHA, set the following parameters, otherwise just keep them empty. + # recaptcha_siteverify_api: "https://hcaptcha.com/siteverify" + # recaptcha_api_js_url: "https://js.hcaptcha.com/1/api.js" + # recaptcha_form_field: "h-captcha-response" + # recaptcha_sitekey_class: "h-captcha" + # TURN server information that this homeserver should send to clients. turn: turn_user_lifetime: "5m" @@ -305,6 +316,14 @@ user_api: # The default lifetime is 3600000ms (60 minutes). # openid_token_lifetime_ms: 3600000 + # Users who register on this homeserver will automatically be joined to the rooms listed under "auto_join_rooms" option. + # By default, any room aliases included in this list will be created as a publicly joinable room + # when the first user registers for the homeserver. If the room already exists, + # make certain it is a publicly joinable room, i.e. the join rule of the room must be set to 'public'. + # As Spaces are just rooms under the hood, Space aliases may also be used. + auto_join_rooms: + # - "#main:matrix.org" + # Configuration for Opentracing. # See https://github.com/matrix-org/dendrite/tree/master/docs/tracing for information on # how this works and how to set it up. From d89634bd1293243ca56636fc834b30c00f795332 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 12 Nov 2022 12:07:41 +0100 Subject: [PATCH 4/4] Remove well-known location too --- scripts/remove | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/remove b/scripts/remove index afa6bf2..e54a08c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -22,6 +22,7 @@ tls_port=$(ynh_app_setting_get --app=$app --key=tls_port) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) +server_name=$(ynh_app_setting_get --app=$app --key=server_name) #================================================= # STANDARD REMOVE @@ -73,6 +74,9 @@ ynh_secure_remove --file="$final_path" #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +# Remove the well-known location +ynh_secure_remove --file="/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf" + # Remove the dedicated NGINX config ynh_remove_nginx_config