diff --git a/README.md b/README.md index 8a0f796..216d861 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Instant messaging server matrix network. Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) -**Shipped version:** 1.34.0 +**Shipped version:** 1.35.1 ## Configuration diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 06ba785..42e9cd8 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.34.0/matrix-synapse_1.34.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=776e6cc2d27f8744860237c70f37f7613a94b1c255dbdc9eeb9d79d5ecc61ace +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.35.1/matrix-synapse_1.35.1-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=61f47a276fa278108081bded1aa133f7b19277309c5d3eb21e99204fb32a8ea6 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_buster.src b/conf/armv7_buster.src index 07344a4..aeab4ed 100644 --- a/conf/armv7_buster.src +++ b/conf/armv7_buster.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.34.0/matrix-synapse_1.34.0-buster-bin1_armv7l.tar.gz -SOURCE_SUM=b21ba7caa429291376bb80bb0ab612bede7f4f5a4bd471ff2fca249d50b3ad26 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.35.1/matrix-synapse_1.35.1-buster-bin1_armv7l.tar.gz +SOURCE_SUM=72df95c4934de966e0c33f8defd52425a345514b456638ac366f3c809ca07400 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 9b1cfe2..026caaa 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server which uses Matrix", "fr": "Un serveur de messagerie instantané basé sur Matrix" }, - "version": "1.34.0~ynh1", + "version": "1.35.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index daef186..d6cdb88 100644 --- a/scripts/install +++ b/scripts/install @@ -301,8 +301,8 @@ ynh_script_progression --message="Configuring coturn..." --weight=1 # Get public IP and set as external IP for coturn # note : '|| true' is used to ignore the errors if we can't get the public ipv4 or ipv6 -public_ip4="$(curl ip.yunohost.org)" || true -public_ip6="$(curl ipv6.yunohost.org)" || true +public_ip4="$(curl -s ip.yunohost.org)" || true +public_ip6="$(curl -s ipv6.yunohost.org)" || true turn_external_ip="" if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4" diff --git a/scripts/restore b/scripts/restore index 21ebd6d..3762652 100644 --- a/scripts/restore +++ b/scripts/restore @@ -174,8 +174,8 @@ ynh_print_ON # Get public IP and set as external IP for coturn # note : '|| true' is used to ignore the errors if we can't get the public ipv4 or ipv6 -public_ip4="$(curl ip.yunohost.org)" || true -public_ip6="$(curl ipv6.yunohost.org)" || true +public_ip4="$(curl -s ip.yunohost.org)" || true +public_ip6="$(curl -s ipv6.yunohost.org)" || true turn_external_ip="" if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4" diff --git a/scripts/upgrade b/scripts/upgrade index 76bc34a..b836c65 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -337,8 +337,8 @@ ynh_script_progression --message="Updating coturn config..." --weight=1 # Get public IP and set as external IP for coturn # note : '|| true' is used to ignore the errors if we can't get the public ipv4 or ipv6 -public_ip4="$(curl ip.yunohost.org)" || true -public_ip6="$(curl ipv6.yunohost.org)" || true +public_ip4="$(curl -s ip.yunohost.org)" || true +public_ip6="$(curl -s ipv6.yunohost.org)" || true turn_external_ip="" if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4" @@ -424,7 +424,7 @@ if yunohost --output-as plain domain list | grep -q "^$server_name"'$' && ! ynh_ ynh_permission_create --permission=server_client_infos --url=$server_name/.well-known/matrix \ --label="Server info for clients. (well-known)" --show_tile=false --allowed=visitors \ --auth_header=false --protected=true -else +elif yunohost --output-as plain domain list | grep -q "^$server_name"'$'; then ynh_permission_url --permission=server_client_infos --url=$server_name/.well-known/matrix \ --auth_header=false ynh_permission_update --permission=server_client_infos --label="Server info for clients. (well-known)" --show_tile=false \