diff --git a/conf/config.yaml b/conf/config.yaml index 997e91b..706bf78 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -141,7 +141,7 @@ bridge: caption_in_message: false # Format for generating URLs from location messages for sending to Signal # Google Maps: 'https://www.google.com/maps/place/%[1]s,%[2]s' - # OpenStreetMap: 'https://www.openstreetmap.org/?mlat=%[1]s&mlon=%[2]' + # OpenStreetMap: 'https://www.openstreetmap.org/?mlat=%[1]s&mlon=%[2]s' location_format: 'https://www.google.com/maps/place/%[1]s,%[2]s' # Whether or not created rooms should have federation enabled. # If false, created portal rooms will never be federated. diff --git a/manifest.toml b/manifest.toml index 8d8fefc..dffc104 100644 --- a/manifest.toml +++ b/manifest.toml @@ -93,10 +93,10 @@ ram.runtime = "128M" in_subdir = false extract = false rename = "mautrix-signal" - amd64.url = "https://github.com/mautrix/signal/releases/download/v0.6.2/mautrix-signal-amd64" - amd64.sha256 = "ad55aea9c55bb250de1165287e061b0b85df82b43fb39a8f5ec5d09592cd186e" - arm64.url = "https://github.com/mautrix/signal/releases/download/v0.6.2/mautrix-signal-arm64" - arm64.sha256 = "b9612d90437eee1ae1062cce84f67eae4321b515276bcff0bf45b4ca0e3ff7d5" + amd64.url = "https://github.com/mautrix/signal/releases/download/v0.6.3/mautrix-signal-amd64" + amd64.sha256 = "b98a509c9e4a2d471d8801ab5f4002f7b3edd6c0d385fb0bc05df8f91cdfd457" + arm64.url = "https://github.com/mautrix/signal/releases/download/v0.6.3/mautrix-signal-arm64" + arm64.sha256 = "af75a17b28f60674a77dd6d96b25ab7fb684767a59f65e928b3ff9c3bf59483e" autoupdate.strategy = "latest_github_release" autoupdate.asset.amd64 = "^mautrix-signal-amd64$" diff --git a/scripts/remove b/scripts/remove index 2022ef9..6f08ce3 100755 --- a/scripts/remove +++ b/scripts/remove @@ -54,9 +54,6 @@ ynh_script_progression --message="Removing various files..." --weight=6 ynh_secure_remove --file="/etc/matrix-$synapse_instance/app-service/$app.yaml" /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh || ynh_die --message="Synapse can't restart with the appservice configuration" -# Remove the log files -ynh_secure_remove --file="/var/log/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index e9858f4..bfd2874 100755 --- a/scripts/restore +++ b/scripts/restore @@ -48,7 +48,7 @@ ynh_script_progression --message="Registering Synapse app-service" --weight=1 $install_dir/mautrix-signal -g -c $install_dir/config.yaml -r /etc/matrix-$synapse_instance/app-service/$app.yaml /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh || ynh_die --message="Synapse can't restart with the appservice configuration" -chown -R $app:$app "$install_dir" +chown -R $app:$app "$install_dir/config.yaml" ynh_store_file_checksum --file="/etc/matrix-$synapse_instance/app-service/$app.yaml" ynh_store_file_checksum --file="$install_dir/config.yaml" diff --git a/scripts/upgrade b/scripts/upgrade index 813b29e..c357095 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,7 +10,7 @@ source _common.sh source /usr/share/yunohost/helpers mautrix_version=$(ynh_app_upstream_version) -synapse_db_name="matrix_$synapse_instance" +synapse_db_name="$(get_synapse_db_name $synapse_instance)" server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name) domain=$(ynh_app_setting_get --app $synapse_instance --key domain) diff --git a/tests.toml b/tests.toml index 142ce5b..d65e3a1 100644 --- a/tests.toml +++ b/tests.toml @@ -12,4 +12,4 @@ test_format = 1.0 args.botadmin = "@johndoe:synapsedomain.tld" args.botusers = "synapsedomain.tld" - test_upgrade_from.53823e7d92a678c5c27f62f64f7e914bd7096d0d.name = "Upgrade from 0.4.3~ynh2 (latest Python version)" + test_upgrade_from.53ee4060497125585a0da304a4128985028d6aee.name = "Upgrade from 0.6.1~ynh1 (first Go version)"