From 9df903b7db948ccfd54e3f4625c203dac74309a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 2 Aug 2018 17:10:02 +0000 Subject: [PATCH 1/4] Upgrade synapse to 0.33.1 --- README.md | 2 +- conf/armv7_jessie.src | 4 ++-- conf/armv7_stretch.src | 4 ++-- conf/python_source.src | 4 ++-- manifest.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b157ad8..db59251 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,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:** 0.33.0 +**Shipped version:** 0.33.1 Configuration ------------- diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src index c040019..8356de5 100644 --- a/conf/armv7_jessie.src +++ b/conf/armv7_jessie.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.33.0/matrix-synapse_0.33.0-jessie-bin1_armv7l.tar.gz -SOURCE_SUM=64a68f2988b8fad7d07c163b1f097beeedbb7d7411baafd2f8595c0291862f20 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.33.1/matrix-synapse_0.33.1-jessie-bin1_armv7l.tar.gz +SOURCE_SUM=cdeffcf86392a92d776198d125e1b3a953eb587e327b0e611cbc78db5b73f9e7 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index c4e0bd1..d09b40b 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.33.0/matrix-synapse_0.33.0-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=e7a766f6eda0b704620d29c4633dfadea1572d8730fde4ec31b79f2d65a0f8eb +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.33.1/matrix-synapse_0.33.1-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=bb6f83dd936b56577bb4bdaa2d1d9dac040bd81cc704bfbbc83f371252975325 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/python_source.src b/conf/python_source.src index 147ce5d..a4e3248 100644 --- a/conf/python_source.src +++ b/conf/python_source.src @@ -1,2 +1,2 @@ -SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.33.0.tar.gz -SOURCE_SUM=5d134216f6efa2ba170d56bc7fe4c3fcaa8dbd7e651a155e729a979bafbfbc7a \ No newline at end of file +SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.33.1.tar.gz +SOURCE_SUM=2fb51254cdc7f12ada7f2f7d848aeeecaa5b484298cfecf18a676790f157e3e4 \ No newline at end of file diff --git a/manifest.json b/manifest.json index 159c639..e6a01cb 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "0.33.0~ynh1", + "version": "0.33.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From dc62daafdffa4bceb6d768047ebd07bbadc14628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 20 Aug 2018 12:45:35 +0200 Subject: [PATCH 2/4] Set executable coturn update config script --- scripts/install | 3 ++- scripts/restore | 1 + scripts/upgrade | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index f03c4cc..dd12558 100644 --- a/scripts/install +++ b/scripts/install @@ -303,9 +303,10 @@ python3 $final_path/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json. # SECURE FILES AND DIRECTORIES #================================================= -# WARRNING : theses command are used in INSTALL, UPGRADE (2 times), RESTORE +# WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files chown $synapse_user:root -R $final_path +chmod 770 $final_path/Coturn_config_rotate.sh chown $synapse_user:root -R /var/lib/matrix-$app chown $synapse_user:root -R /var/log/matrix-$app chown $synapse_user:root -R /etc/matrix-$app diff --git a/scripts/restore b/scripts/restore index 2f907a8..f260bb8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -173,6 +173,7 @@ ynh_use_logrotate /var/log/matrix-$app # WARNING : these commands are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files chown $synapse_user:root -R $final_path +chmod 770 $final_path/Coturn_config_rotate.sh chown $synapse_user:root -R /var/lib/matrix-$app chown $synapse_user:root -R /var/log/matrix-$app chown $synapse_user:root -R /etc/matrix-$app diff --git a/scripts/upgrade b/scripts/upgrade index 54aca18..4f6eeab 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -274,9 +274,10 @@ ynh_add_systemd_config coturn-$app coturn-synapse.service # SECURE FILES AND DIRECTORIES #================================================= -# WARRNING : theses command are used in INSTALL, UPGRADE (2 times), RESTORE +# WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files chown $synapse_user:root -R $final_path +chmod 770 $final_path/Coturn_config_rotate.sh chown $synapse_user:root -R /var/lib/matrix-$app chown $synapse_user:root -R /var/log/matrix-$app chown $synapse_user:root -R /etc/matrix-$app From 17a017cf3d5b0785112dc10d11f3a73fe0c78cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 20 Aug 2018 12:46:38 +0200 Subject: [PATCH 3/4] Set acl access in Coturn config update script --- sources/Coturn_config_rotate.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/Coturn_config_rotate.sh b/sources/Coturn_config_rotate.sh index 186e6bc..1112730 100644 --- a/sources/Coturn_config_rotate.sh +++ b/sources/Coturn_config_rotate.sh @@ -25,4 +25,6 @@ fi ynh_replace_string "^external-ip=.*\$" "$external_IP_line" "/etc/matrix-$app_instance/coturn.conf" -exit 0 \ No newline at end of file +setfacl -R -m user:turnserver:rX /etc/matrix-$app + +exit 0 From 70981718a2ceee38d8a4536615b5db7e8c23bfba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 20 Aug 2018 14:12:42 +0200 Subject: [PATCH 4/4] Restart coturn in update coturn config script --- sources/Coturn_config_rotate.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/Coturn_config_rotate.sh b/sources/Coturn_config_rotate.sh index 1112730..e01c3fc 100644 --- a/sources/Coturn_config_rotate.sh +++ b/sources/Coturn_config_rotate.sh @@ -25,6 +25,8 @@ fi ynh_replace_string "^external-ip=.*\$" "$external_IP_line" "/etc/matrix-$app_instance/coturn.conf" -setfacl -R -m user:turnserver:rX /etc/matrix-$app +setfacl -R -m user:turnserver:rX /etc/matrix-$app_instance + +systemctl restart coturn-$app_instance.service exit 0