From 43e57be7ca18875baffa7b2e726a7a268cd58a0a Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 24 Mar 2019 16:48:05 +0100 Subject: [PATCH 1/9] Update pull_request_template.md --- pull_request_template.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index bdb65a7..16dea8d 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -19,7 +19,6 @@ - [ ] **Approval (LGTM)** : - [ ] **Approval (LGTM)** : - **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20-BRANCH-%20(Official)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.* -or -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-%20(Official_fork)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.* +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-/) +*Please replace '-NUM-' in this link by the PR number.* When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From e62bd19eda32694265c00d8c6cdf1ff3b847e05d Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 15 Apr 2019 20:54:47 +0200 Subject: [PATCH 2/9] Move from ci-apps-dev to ci-apps-hq --- pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull_request_template.md b/pull_request_template.md index 16dea8d..d97227b 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -19,6 +19,6 @@ - [ ] **Approval (LGTM)** : - [ ] **Approval (LGTM)** : - **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-/) +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-/) *Please replace '-NUM-' in this link by the PR number.* When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From c9a1e40e4112583a9a64f09b8bf558ff307c158e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 4 Apr 2019 19:59:03 +0000 Subject: [PATCH 3/9] Upgrade synapse to 0.99.3 --- README.md | 2 +- conf/armv7_jessie.src | 4 ++-- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b54d1ba..c6fefaa 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.99.2 +**Shipped version:** 0.99.3 Configuration ------------- diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src index 8638170..47a1210 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.99.2/matrix-synapse_0.99.2-jessie-bin1_armv7l.tar.gz -SOURCE_SUM=dd8252d1a6484e21378262e93410155eadf54e31a56426cf2ff587ac773365ef +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.3/matrix-synapse_0.99.3-jessie-bin1_armv7l.tar.gz +SOURCE_SUM=38b2b4c433cb996013fdbb59eed040b3aaf068a90e4708fa278189aa94fb0606 # (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 12b4e32..9923309 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.99.2/matrix-synapse_0.99.2-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=28226b32d1e82e281835e4c47fd745b0901c67cf3a87db9ff7982fa0e1591cf4 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.3/matrix-synapse_0.99.3-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=cd99cc9a646a5fa54291c20b5dcb95ffed3bd7292ba3842770fc4c9b2fdb64c6 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 9ba3cb1..84829f7 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.99.2~ynh1", + "version": "0.99.3~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 33e60d3a617fab042ba2d4cb99e8c6af377ed130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 4 May 2019 10:01:24 +0000 Subject: [PATCH 4/9] Upgrade synapse to 0.99.3.2 --- README.md | 2 +- conf/armv7_jessie.src | 4 ++-- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c6fefaa..5449789 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.99.3 +**Shipped version:** 0.99.3.2 Configuration ------------- diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src index 47a1210..1184cbf 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.99.3/matrix-synapse_0.99.3-jessie-bin1_armv7l.tar.gz -SOURCE_SUM=38b2b4c433cb996013fdbb59eed040b3aaf068a90e4708fa278189aa94fb0606 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.3.2/matrix-synapse_0.99.3.2-jessie-bin1_armv7l.tar.gz +SOURCE_SUM=1ac64b9e8fe8f31dfffdcd3adc09852285e521ff0570b3b3a01f875a2291b842 # (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 9923309..8f99bba 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.99.3/matrix-synapse_0.99.3-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=cd99cc9a646a5fa54291c20b5dcb95ffed3bd7292ba3842770fc4c9b2fdb64c6 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.3.2/matrix-synapse_0.99.3.2-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=ac8d2383eed0763a7060371fa4f0d8512e6a17ff724ba3e0da742d67392309a7 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 84829f7..0651763 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.99.3~ynh1", + "version": "0.99.3.2~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From dcfdbc32017b906c1ad8a6165872db334aa571a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 6 May 2019 15:37:18 +0200 Subject: [PATCH 5/9] Use the sso script directly from the config directroy --- manifest.json | 4 ++-- scripts/install | 4 +--- scripts/remove | 2 +- scripts/restore | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 84829f7..52e4a55 100644 --- a/manifest.json +++ b/manifest.json @@ -3,13 +3,13 @@ "id": "synapse", "packaging_format": 1, "requirements": { - "yunohost": ">= 2.7.14" + "yunohost": ">= 3.5.0" }, "description": { "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "0.99.3~ynh1", + "version": "0.99.3~ynh2", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index 1cf481b..795458c 100644 --- a/scripts/install +++ b/scripts/install @@ -313,9 +313,7 @@ ynh_replace_string __APP__ $app "$final_path/Coturn_config_rotate.sh" # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -cp ../conf/add_sso_conf.py $final_path -cp ../conf/remove_sso_conf.py $final_path -python3 $final_path/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent don't respect the json synaxe. Please fix the synaxe to install this app. For more information see here : https://github.com/YunoHost-Apps/synapse_ynh/issues/32" +python3 ../conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent don't respect the json synaxe. Please fix the synaxe to install this app. For more information see here : https://github.com/YunoHost-Apps/synapse_ynh/issues/32" #================================================= # SECURE FILES AND DIRECTORIES diff --git a/scripts/remove b/scripts/remove index 01dcc21..ccedf27 100755 --- a/scripts/remove +++ b/scripts/remove @@ -64,7 +64,7 @@ closeport $turnserver_alt_tls_port #================================================= # Remove the skipped url -python3 $final_path/remove_sso_conf.py +python3 ../conf/remove_sso_conf.py #================================================= # REMOVE DEPENDENCIES diff --git a/scripts/restore b/scripts/restore index 8b940dc..1a50a34 100644 --- a/scripts/restore +++ b/scripts/restore @@ -148,7 +148,7 @@ yunohost firewall allow Both $turnserver_alt_tls_port > /dev/null 2>&1 # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -python3 $final_path/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent don't respect the json synaxe. Please fix the synaxe to install this app. For more information see here : https://github.com/YunoHost-Apps/synapse_ynh/issues/32" +python3 ../settings/conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent don't respect the json synaxe. Please fix the synaxe to install this app. For more information see here : https://github.com/YunoHost-Apps/synapse_ynh/issues/32" #================================================= # RESTORE THE POSTGRESQL DATABASE From 741d520f551e4c47fd737289c34a334da75775f9 Mon Sep 17 00:00:00 2001 From: Josue-T Date: Sun, 12 May 2019 16:48:23 +0200 Subject: [PATCH 6/9] Fix typo Co-Authored-By: JimboJoe --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 795458c..0ce0279 100644 --- a/scripts/install +++ b/scripts/install @@ -313,7 +313,7 @@ ynh_replace_string __APP__ $app "$final_path/Coturn_config_rotate.sh" # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -python3 ../conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent don't respect the json synaxe. Please fix the synaxe to install this app. For more information see here : https://github.com/YunoHost-Apps/synapse_ynh/issues/32" +python3 ../conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent doesn't respect the json syntax. Please fix the syntax to install this app. For more information see here: https://github.com/YunoHost-Apps/synapse_ynh/issues/32" #================================================= # SECURE FILES AND DIRECTORIES From c36c8f066ca291fc68f5dd0beddfac880e53200f Mon Sep 17 00:00:00 2001 From: Josue-T Date: Sun, 12 May 2019 16:48:36 +0200 Subject: [PATCH 7/9] Fix typo Co-Authored-By: JimboJoe --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 1a50a34..de7c3ca 100644 --- a/scripts/restore +++ b/scripts/restore @@ -148,7 +148,7 @@ yunohost firewall allow Both $turnserver_alt_tls_port > /dev/null 2>&1 # Open access to server without a button the home # The script "add_sso_conf.py" will just add en entry for the path "/_matrix" in the sso conf.json.persistent file in the cathegory "skipped_urls". -python3 ../settings/conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent don't respect the json synaxe. Please fix the synaxe to install this app. For more information see here : https://github.com/YunoHost-Apps/synapse_ynh/issues/32" +python3 ../settings/conf/add_sso_conf.py || ynh_die "Your file /etc/ssowat/conf.json.persistent doesn't respect the json syntax. Please fix the syntax to install this app. For more information see here: https://github.com/YunoHost-Apps/synapse_ynh/issues/32" #================================================= # RESTORE THE POSTGRESQL DATABASE From c19b7a8bf9e64281b8ae58ca0f4b17997a69e04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 16 May 2019 08:30:41 +0000 Subject: [PATCH 8/9] Upgrade synapse to 0.99.4 --- README.md | 2 +- conf/armv7_jessie.src | 4 ++-- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5449789..c8ae4ad 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.99.3.2 +**Shipped version:** 0.99.4 Configuration ------------- diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src index 1184cbf..bfc1c0a 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.99.3.2/matrix-synapse_0.99.3.2-jessie-bin1_armv7l.tar.gz -SOURCE_SUM=1ac64b9e8fe8f31dfffdcd3adc09852285e521ff0570b3b3a01f875a2291b842 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.4/matrix-synapse_0.99.4-jessie-bin1_armv7l.tar.gz +SOURCE_SUM=be84ec6b1588e3a380f7b61fa1e023271dabb1a6db4c8aee826a6093184712e6 # (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 8f99bba..c75346d 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.99.3.2/matrix-synapse_0.99.3.2-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=ac8d2383eed0763a7060371fa4f0d8512e6a17ff724ba3e0da742d67392309a7 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.4/matrix-synapse_0.99.4-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=2581a09ee456331580a99b09f30a8f684fbfc22038fc194caf6f231795e578a8 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index be5532a..2c05c97 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.99.3.2~ynh1", + "version": "0.99.4~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 7841c79f0b97773ea8f4ce5890fef796947fd409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 22 May 2019 18:32:44 +0000 Subject: [PATCH 9/9] Upgrade synapse to 0.99.5.1 --- README.md | 2 +- conf/armv7_jessie.src | 4 ++-- conf/armv7_stretch.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c8ae4ad..b691140 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.99.4 +**Shipped version:** 0.99.5.1 Configuration ------------- diff --git a/conf/armv7_jessie.src b/conf/armv7_jessie.src index bfc1c0a..24d49c6 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.99.4/matrix-synapse_0.99.4-jessie-bin1_armv7l.tar.gz -SOURCE_SUM=be84ec6b1588e3a380f7b61fa1e023271dabb1a6db4c8aee826a6093184712e6 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.1/matrix-synapse_0.99.5.1-jessie-bin1_armv7l.tar.gz +SOURCE_SUM=da24c88adb88e31179aab03aeec6f73394ebf8078166e141340a243b3b81bc8e # (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 c75346d..cc53495 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.99.4/matrix-synapse_0.99.4-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=2581a09ee456331580a99b09f30a8f684fbfc22038fc194caf6f231795e578a8 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.99.5.1/matrix-synapse_0.99.5.1-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=55c060870593c140d05c60e5993a7fcf564d56c9e194d1a203c43de0b71b9591 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 2c05c97..bb6d2f5 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.99.4~ynh1", + "version": "0.99.5.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": {