Upgrade to 1.76.0, remove buster, add bookworm

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Synapse for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Working status](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Working status](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg)
 [![Install Synapse with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -20,7 +20,7 @@ Instant messaging server matrix network.
 Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)
 
 
-**Shipped version:** 1.74.0~ynh1
+**Shipped version:** 1.76.0~ynh1
 ## Disclaimers / important information
 
 ## Configuration

README_fr.md

@@ -5,22 +5,22 @@ It shall NOT be edited by hand.
 
 # Synapse pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/synapse.svg)](https://dash.yunohost.org/appci/app/synapse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/synapse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/synapse.maintain.svg)
 [![Installer Synapse avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=synapse)
 
 *[Read this readme in english.](./README.md)*
 
-> *Ce package vous permet d'installer Synapse rapidement et simplement sur un serveur YunoHost.
-Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+> *Ce package vous permet d’installer Synapse rapidement et simplement sur un serveur YunoHost.
+Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
 
-## Vue d'ensemble
+## Vue d’ensemble
 
 Instant messaging server matrix network.
 
 Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)
 
 
-**Version incluse :** 1.74.0~ynh1
+**Version incluse :** 1.76.0~ynh1
 ## Avertissements / informations importantes
 
 ## Configuration
@@ -205,8 +205,8 @@ Before installing a second instance of the app it's really recommended to update
 
 ## Documentations et ressources
 
-* Site officiel de l'app : <https://matrix.org/>
-* Dépôt de code officiel de l'app : <https://github.com/matrix-org/synapse>
+* Site officiel de l’app : <https://matrix.org/>
+* Dépôt de code officiel de l’app : <https://github.com/matrix-org/synapse>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_synapse>
 * Signaler un bug : <https://github.com/YunoHost-Apps/synapse_ynh/issues>
 
@@ -222,4 +222,4 @@ ou
 sudo yunohost app upgrade synapse -u https://github.com/YunoHost-Apps/synapse_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

conf/armv7_buster.src → conf/armv7_bookworm.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.74.0/matrix-synapse_1.74.0-buster-bin1_armv7l.tar.gz
-SOURCE_SUM=4c7412eab47e9ac4ccc6cde6cbe33dbee2badbbded475cef5bb2b2e3ee926d62
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.76.0/matrix-synapse_1.76.0-bookworm-bin1_armv7l.tar.gz
+SOURCE_SUM=11b45507a34f16cae39eed899798f7078d54f32190ebc2c9b1450a1410eb639d
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum

conf/armv7_bullseye.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.74.0/matrix-synapse_1.74.0-bullseye-bin1_armv7l.tar.gz
-SOURCE_SUM=27f0cfad22014cf1eb75492e04996156d7284d1f419d23e0e4970c5ff479ba7d
+SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.76.0/matrix-synapse_1.76.0-bullseye-bin1_armv7l.tar.gz
+SOURCE_SUM=255fe98712d7482a68305e641e507048fb6c123e67912b788e6eeeb511b598cc
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum

manifest.json

@@ -6,7 +6,7 @@
 		"en": "Instant messaging server which uses Matrix",
 		"fr": "Serveur de messagerie instantané basé sur Matrix"
 	},
-	"version": "1.74.0~ynh1",
+	"version": "1.76.0~ynh1",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {
@@ -19,7 +19,7 @@
         "code": "https://github.com/matrix-org/synapse"
     },
 	"requirements": {
-		"yunohost": ">= 4.1.2"
+		"yunohost": ">= 11.0.11"
 	},
 	"multi_instance": true,
 	"services": [

scripts/_common.sh

@@ -51,7 +51,7 @@ install_sources() {
         else
             pip3 install --upgrade setuptools wheel pip
         fi
-        
+
         chown $synapse_user:root -R $final_path
         sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade 'cryptography>=3.4.7' 'pyOpenSSL>=22.1.0' 'attrs>=22.1.0'
         pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2
@@ -71,6 +71,6 @@ install_sources() {
 
 get_domain_list() {
     yunohost --output-as plain domain list | grep -E "^#" -v | sort | uniq | while read domain; do
-        echo -n "        - https://$domain\n"
+        echo -n "      - https://$domain\n"
     done
 }

scripts/change_url

@@ -49,7 +49,8 @@ synapse_db_name="matrix_$app"
 synapse_db_user="matrix_$app"
 synapse_db_name="matrix_$app"
 upstream_version=$(ynh_app_upstream_version)
-domain_whitelist_client=$(get_domain_list)
+domain_whitelist_client_=$(get_domain_list)
+domain_whitelist_client=${domain_whitelist_client_%"\n"}
 
 # Check if the new path stay /_matrix if not exit
 

scripts/config

@@ -27,7 +27,8 @@ is_free_registration=$(ynh_app_setting_get --app $app --key is_free_registration
 jitsi_server=$(ynh_app_setting_get --app=$app --key=jitsi_server)
 e2e_enabled_by_default=$(ynh_app_setting_get --app=$app --key=e2e_enabled_by_default)
 synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd)
-domain_whitelist_client=$(get_domain_list)
+domain_whitelist_client_=$(get_domain_list)
+domain_whitelist_client=${domain_whitelist_client_%"\n"}
 main_domain=$(yunohost domain list --output-as json | jq -r .main)
 
 #=================================================

scripts/install

@@ -36,7 +36,8 @@ report_stats="false"
 allow_public_rooms="false"
 e2e_enabled_by_default="true"
 default_domain_value="Same than the domain"
-domain_whitelist_client=$(get_domain_list)
+domain_whitelist_client_=$(get_domain_list)
+domain_whitelist_client=${domain_whitelist_client_%"\n"}
 
 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
@@ -302,12 +303,12 @@ public_ip6="$(curl -s ipv6.yunohost.org)" || true
 turn_external_ip=""
 if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
 then
-    turn_external_ip+="\nexternal-ip=$public_ip4"
+    turn_external_ip+="external-ip="$public_ip4%"\n"
 fi
 
 if [ -n "$public_ip6" ] && ynh_validate_ip6 --ip_address="$public_ip6"
 then
-    turn_external_ip+="\nexternal-ip=$public_ip6"
+    turn_external_ip+="external-ip="$public_ip6%"\n"
 fi
 
 ynh_add_config --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf"

scripts/restore

@@ -182,12 +182,12 @@ public_ip6="$(curl -s ipv6.yunohost.org)" || true
 turn_external_ip=""
 if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
 then
-    turn_external_ip+="\nexternal-ip=$public_ip4"
+    turn_external_ip+="external-ip="$public_ip4%"\n"
 fi
 
 if [ -n "$public_ip6" ] && ynh_validate_ip6 --ip_address="$public_ip6"
 then
-    turn_external_ip+="\nexternal-ip=$public_ip6"
+    turn_external_ip+="external-ip="$public_ip6%"\n"
 fi
 
 ynh_add_config --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf"

scripts/upgrade

@@ -41,7 +41,8 @@ registration_shared_secret=$(ynh_app_setting_get --app=$app --key=registration_s
 form_secret=$(ynh_app_setting_get --app=$app --key=form_secret)
 macaroon_secret_key=$(ynh_app_setting_get --app=$app --key=macaroon_secret_key)
 synapse_user_app_pwd=$(ynh_app_setting_get --app=$app --key=synapse_user_app_pwd)
-domain_whitelist_client=$(get_domain_list)
+domain_whitelist_client_=$(get_domain_list)
+domain_whitelist_client=${domain_whitelist_client_%"\n"}
 main_domain=$(yunohost domain list --output-as json | jq -r .main)
 
 #=================================================
@@ -357,12 +358,12 @@ public_ip6="$(curl -s ipv6.yunohost.org)" || true
 turn_external_ip=""
 if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
 then
-    turn_external_ip+="\nexternal-ip=$public_ip4"
+    turn_external_ip+="external-ip="$public_ip4%"\n"
 fi
 
 if [ -n "$public_ip6" ] && ynh_validate_ip6 --ip_address="$public_ip6"
 then
-    turn_external_ip+="\nexternal-ip=$public_ip6"
+    turn_external_ip+="external-ip="$public_ip6%"\n"
 fi
 
 ynh_add_config --template="turnserver.conf" --destination="/etc/matrix-$app/coturn.conf"