mirror of
https://github.com/YunoHost-Apps/synapse_ynh.git
synced 2024-09-03 20:26:38 +02:00
Merge branch 'testing'
This commit is contained in:
commit
67c05e152a
7 changed files with 13 additions and 13 deletions
|
@ -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)
|
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
|
## Configuration
|
||||||
|
|
||||||
|
|
|
@ -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_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=776e6cc2d27f8744860237c70f37f7613a94b1c255dbdc9eeb9d79d5ecc61ace
|
SOURCE_SUM=61f47a276fa278108081bded1aa133f7b19277309c5d3eb21e99204fb32a8ea6
|
||||||
# (Optional) Program to check the integrity (sha256sum, md5sum...)
|
# (Optional) Program to check the integrity (sha256sum, md5sum...)
|
||||||
# default: sha256
|
# default: sha256
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
|
|
|
@ -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_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=b21ba7caa429291376bb80bb0ab612bede7f4f5a4bd471ff2fca249d50b3ad26
|
SOURCE_SUM=72df95c4934de966e0c33f8defd52425a345514b456638ac366f3c809ca07400
|
||||||
# (Optional) Program to check the integrity (sha256sum, md5sum...)
|
# (Optional) Program to check the integrity (sha256sum, md5sum...)
|
||||||
# default: sha256
|
# default: sha256
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"en": "Instant messaging server which uses Matrix",
|
"en": "Instant messaging server which uses Matrix",
|
||||||
"fr": "Un serveur de messagerie instantané basé sur Matrix"
|
"fr": "Un serveur de messagerie instantané basé sur Matrix"
|
||||||
},
|
},
|
||||||
"version": "1.34.0~ynh1",
|
"version": "1.35.1~ynh1",
|
||||||
"url": "http://matrix.org",
|
"url": "http://matrix.org",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"maintainer": {
|
"maintainer": {
|
||||||
|
|
|
@ -301,8 +301,8 @@ ynh_script_progression --message="Configuring coturn..." --weight=1
|
||||||
|
|
||||||
# Get public IP and set as external IP for coturn
|
# 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
|
# 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_ip4="$(curl -s ip.yunohost.org)" || true
|
||||||
public_ip6="$(curl ipv6.yunohost.org)" || true
|
public_ip6="$(curl -s ipv6.yunohost.org)" || true
|
||||||
|
|
||||||
turn_external_ip=""
|
turn_external_ip=""
|
||||||
if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
|
if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
|
||||||
|
|
|
@ -174,8 +174,8 @@ ynh_print_ON
|
||||||
|
|
||||||
# Get public IP and set as external IP for coturn
|
# 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
|
# 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_ip4="$(curl -s ip.yunohost.org)" || true
|
||||||
public_ip6="$(curl ipv6.yunohost.org)" || true
|
public_ip6="$(curl -s ipv6.yunohost.org)" || true
|
||||||
|
|
||||||
turn_external_ip=""
|
turn_external_ip=""
|
||||||
if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
|
if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
|
||||||
|
|
|
@ -337,8 +337,8 @@ ynh_script_progression --message="Updating coturn config..." --weight=1
|
||||||
|
|
||||||
# Get public IP and set as external IP for coturn
|
# 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
|
# 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_ip4="$(curl -s ip.yunohost.org)" || true
|
||||||
public_ip6="$(curl ipv6.yunohost.org)" || true
|
public_ip6="$(curl -s ipv6.yunohost.org)" || true
|
||||||
|
|
||||||
turn_external_ip=""
|
turn_external_ip=""
|
||||||
if [ -n "$public_ip4" ] && ynh_validate_ip4 --ip_address="$public_ip4"
|
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 \
|
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 \
|
--label="Server info for clients. (well-known)" --show_tile=false --allowed=visitors \
|
||||||
--auth_header=false --protected=true
|
--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 \
|
ynh_permission_url --permission=server_client_infos --url=$server_name/.well-known/matrix \
|
||||||
--auth_header=false
|
--auth_header=false
|
||||||
ynh_permission_update --permission=server_client_infos --label="Server info for clients. (well-known)" --show_tile=false \
|
ynh_permission_update --permission=server_client_infos --label="Server info for clients. (well-known)" --show_tile=false \
|
||||||
|
|
Loading…
Add table
Reference in a new issue