From 122203b772cb698dfd0f0765a0a6d6bf7777c986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 6 May 2021 00:23:07 +0200 Subject: [PATCH 1/6] Upgrade synapse to 1.33.0 --- README.md | 2 +- conf/armv7_bullseye.src | 4 ++-- conf/armv7_buster.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d696d24..76e90d1 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.32.2 +**Shipped version:** 1.33.0 ## Configuration diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 2a0927f..eb8d16a 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.32.2/matrix-synapse_1.32.2-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=ffb97a1c488a60e7106d45bfe71c7c28fd4ac9b6083798f626fca5c20cec3148 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.33.0/matrix-synapse_1.33.0-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=9c06450d6a7731852b76d277b0ac72a9bcc11ea0ac6975f91c9a35eca1678a34 # (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 5c4526e..0aadeb6 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.32.2/matrix-synapse_1.32.2-buster-bin1_armv7l.tar.gz -SOURCE_SUM=0343c6622f246b3a7809fefc032c2b2a8d0433020cd064ab92b1d2ed1f9a7c85 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.33.0/matrix-synapse_1.33.0-buster-bin1_armv7l.tar.gz +SOURCE_SUM=ebf3613d47a513322e31512285fb86d0dec776f99bea9a87d66281862e6fb01d # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index a80b3f7..308524d 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.32.2~ynh1", + "version": "1.33.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 89f12fb6061ffd6527865e35ae79e1b7fbac1fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 7 May 2021 00:27:22 +0200 Subject: [PATCH 2/6] Upgrade synapse to 1.33.1 --- README.md | 2 +- conf/armv7_bullseye.src | 4 ++-- conf/armv7_buster.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 76e90d1..9cc039a 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.33.0 +**Shipped version:** 1.33.1 ## Configuration diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index eb8d16a..4d3a6ef 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.33.0/matrix-synapse_1.33.0-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=9c06450d6a7731852b76d277b0ac72a9bcc11ea0ac6975f91c9a35eca1678a34 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.33.1/matrix-synapse_1.33.1-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=435a631a03ab231a4a666e306bb41266c8846b0b346aaad4ab2fd0c21b29eeb0 # (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 0aadeb6..6a744c1 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.33.0/matrix-synapse_1.33.0-buster-bin1_armv7l.tar.gz -SOURCE_SUM=ebf3613d47a513322e31512285fb86d0dec776f99bea9a87d66281862e6fb01d +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.33.1/matrix-synapse_1.33.1-buster-bin1_armv7l.tar.gz +SOURCE_SUM=f6f957d262e904638be0a906a448171ab427ae871b0143c081f18c79997dc549 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 308524d..c2c42b4 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.33.0~ynh1", + "version": "1.33.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From 606509f134a4a515c5ae035fede03dd29331d107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 9 May 2021 15:25:02 +0200 Subject: [PATCH 3/6] Fix issue #259 --- scripts/install | 9 +++++++-- scripts/upgrade | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 9a1184c..daef186 100644 --- a/scripts/install +++ b/scripts/install @@ -344,10 +344,15 @@ ynh_script_progression --message="Configuring permissions..." --weight=1 ynh_permission_url --permission=main --url=$domain/_matrix/cas_server.php/login --auth_header=true ynh_permission_update --permission=main --show_tile=false --protected=true -ynh_permission_create --permission=server_api --url=$domain/_matrix --additional_urls=$server_name/.well-known/matrix \ +ynh_permission_create --permission=server_api --url=$domain/_matrix \ --label="Server access for client apps." --show_tile=false --allowed=visitors \ --auth_header=false --protected=true - +if yunohost --output-as plain domain list | grep -q "^$server_name$"; then + 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 +fi + #================================================= # UPDATE HOOKS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 174a103..76bc34a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -408,18 +408,29 @@ ynh_permission_url --permission=main --url=$domain/_matrix/cas_server.php/login ynh_permission_update --permission=main --show_tile=false --protected=true if ! ynh_permission_exists --permission=server_api; then - ynh_permission_create --permission=server_api --url=$domain/_matrix --additional_urls=$server_name/.well-known/matrix \ + ynh_permission_create --permission=server_api --url=$domain/_matrix \ --label="Server access for client apps." --show_tile=false --allowed=visitors \ --auth_header=false --protected=true python3 remove_sso_conf_persistent.py $domain $server_name \ || ynh_print_warn --message="Your file /etc/ssowat/""conf.json.persistent doesn't respect the json syntax. The config file wasn't cleaned. Please clean it manually." else - ynh_permission_url --permission=server_api --url=$domain/_matrix --add_url=$server_name/.well-known/matrix \ + ynh_permission_url --permission=server_api --url=$domain/_matrix --remove_url=$server_name/.well-known/matrix \ --auth_header=false ynh_permission_update --permission=server_api --label="Server access for client apps." --show_tile=false \ --protected=true fi +if yunohost --output-as plain domain list | grep -q "^$server_name"'$' && ! ynh_permission_exists --permission=server_client_infos; then + 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 + 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 \ + --protected=true +fi + #================================================= # SECURE FILES AND DIRECTORIES #================================================= From 2dee32e75f7bf640d1b67427b62a0bec83d8221b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 13 May 2021 17:53:06 +0200 Subject: [PATCH 4/6] [autopatch] Update issue and PR templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ pull_request_template.md | 12 ------- 3 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 36526ee..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,12 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how you fix that* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. From 5a8e6598bcfaf02b20acae3f75ce26e75e2bd98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 12 May 2021 00:39:58 +0200 Subject: [PATCH 5/6] Upgrade synapse to 1.33.2 --- README.md | 2 +- conf/armv7_bullseye.src | 4 ++-- conf/armv7_buster.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9cc039a..cd72857 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.33.1 +**Shipped version:** 1.33.2 ## Configuration diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 4d3a6ef..21857a1 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.33.1/matrix-synapse_1.33.1-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=435a631a03ab231a4a666e306bb41266c8846b0b346aaad4ab2fd0c21b29eeb0 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.33.2/matrix-synapse_1.33.2-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=39f2b421ccd1ccaeb5c76045c9fcd9b7099b120f8b5bd91eb9861bbd404326a9 # (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 6a744c1..27f4960 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.33.1/matrix-synapse_1.33.1-buster-bin1_armv7l.tar.gz -SOURCE_SUM=f6f957d262e904638be0a906a448171ab427ae871b0143c081f18c79997dc549 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.33.2/matrix-synapse_1.33.2-buster-bin1_armv7l.tar.gz +SOURCE_SUM=ae247f4b8d6623dee2bb3a6a6883e03d82644f4dbbe7f8d9d39ea17d0a4f2cac # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index c2c42b4..169fecb 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.33.1~ynh1", + "version": "1.33.2~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { From a2e5ad99b5ff552f727af0b616ae35cc70bffb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 18 May 2021 00:22:53 +0200 Subject: [PATCH 6/6] Upgrade synapse to 1.34.0 --- README.md | 2 +- conf/armv7_bullseye.src | 4 ++-- conf/armv7_buster.src | 4 ++-- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cd72857..8a0f796 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.33.2 +**Shipped version:** 1.34.0 ## Configuration diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 21857a1..06ba785 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.33.2/matrix-synapse_1.33.2-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=39f2b421ccd1ccaeb5c76045c9fcd9b7099b120f8b5bd91eb9861bbd404326a9 +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 # (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 27f4960..07344a4 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.33.2/matrix-synapse_1.33.2-buster-bin1_armv7l.tar.gz -SOURCE_SUM=ae247f4b8d6623dee2bb3a6a6883e03d82644f4dbbe7f8d9d39ea17d0a4f2cac +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 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 169fecb..9b1cfe2 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.33.2~ynh1", + "version": "1.34.0~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": {