From 4a3523144fc8615d9312e98f36fa9e6afc72ce0e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 4 Jun 2023 06:18:19 +0000 Subject: [PATCH 01/14] Upgrade to v2.5.299 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index b4ea82e..9c46301 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/v2.5.298/wiki-js.tar.gz -SOURCE_SUM=3bb290d77e3387dba5958c906629a6c5f751c17787903f1a021cbfa51cc88f1a +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/v2.5.299/wiki-js.tar.gz +SOURCE_SUM=1987b4e5d6d1f11c02ccf79d782314413599e75ae833f5768d43cfbfba3b5045 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index df6622d..785e7e8 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source powerful wiki app built on Node.js, Git and Markdown", "fr": "Wiki open source propulsé par Node.js, Git et Markdown" }, - "version": "2.5.298~ynh1", + "version": "2.5.299~ynh1", "url": "https://wiki.js.org/", "upstream": { "license": "AGPL-3.0-or-later", From 98de03b72ad129a803459f4e84f65a44e88433be Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 4 Jun 2023 06:18:26 +0000 Subject: [PATCH 02/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2ce7ab1..b08cb54 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.5.298~ynh1 +**Shipped version:** 2.5.299~ynh1 **Demo:** https://docs-beta.requarks.io/ diff --git a/README_fr.md b/README_fr.md index 081ec22..52f6bf7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Version incluse :** 2.5.298~ynh1 +**Version incluse :** 2.5.299~ynh1 **Démo :** https://docs-beta.requarks.io/ From 11f5f01d73dd7508760c583245d901768e7df845 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 5 Jul 2023 00:44:23 +0200 Subject: [PATCH 03/14] [autopatch] Fix Host and X-Forwarded-For header spoofing --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6cbf0cf..22e9f0f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,7 +6,7 @@ location / { proxy_set_header Accept-Encoding ""; proxy_pass http://localhost:__PORT__; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; From 05ad4cbb29e2a6e5193ebb3025ceec040f59b070 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 4 Aug 2023 20:20:28 +0200 Subject: [PATCH 04/14] Fix bookworm --- scripts/change_url | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 99279bd..c6102a5 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -72,7 +72,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service" +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped" #================================================= # MODIFY URL IN NGINX CONF diff --git a/scripts/upgrade b/scripts/upgrade index 990f408..5300343 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -55,7 +55,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service" +ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped" #================================================= # ENSURE DOWNWARD COMPATIBILITY From fb0b70c657a0ec8b5a3ba9ab32bc77bac9c147b9 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 4 Aug 2023 21:00:04 +0200 Subject: [PATCH 05/14] Update updater.sh --- .github/workflows/updater.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 9eab22e..abe6f74 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -24,7 +24,7 @@ assets="https://github.com/Requarks/wiki/releases/download/$version/wiki-js.tar. # Sometimes the release name starts with a "v", so let's filter it out. # You may need more tweaks here if the upstream repository has different naming conventions. if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} + version=${version:1} fi # Setting up the environment variables @@ -36,12 +36,12 @@ echo "PROCEED=false" >> $GITHUB_ENV # Proceed only if the retrieved version is greater than the current one if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 + echo "::warning ::No new version available" + exit 0 # Proceed only if a PR for this new version does not already exist elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 + echo "::warning ::A branch already exists for this update" + exit 0 fi #================================================= From 84733d81d242469180a7419046741c9241c54bfd Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 4 Aug 2023 22:47:59 +0200 Subject: [PATCH 06/14] Fix bookworm --- scripts/_common.sh | 2 +- scripts/upgrade | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 8fddb7d..581c006 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="postgresql postgresql-contrib" +pkg_dependencies="postgresql postgresql-contrib rsync" nodejs_version=16 diff --git a/scripts/upgrade b/scripts/upgrade index 5300343..7eb24ca 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_script_progression --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME @@ -100,6 +100,8 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies + #================================================= # CREATE DEDICATED USER #================================================= From 745754b5c1c022b3b0473bf0f88111c916703d98 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 5 Aug 2023 13:38:23 +0200 Subject: [PATCH 07/14] Update check_process --- check_process | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 2542ff1..03b6e2c 100644 --- a/check_process +++ b/check_process @@ -48,10 +48,12 @@ upgrade=1 from_commit=de01b48bfee4abff5edcf2fd288d3ff930ccc45a # 2.5.272~ynh1 upgrade=1 from_commit=0721e06b03c1fa384adcade256b1d67c9462d61e + # 2.5.299~ynh1 + upgrade=1 from_commit=562dde836f45847aaf53caa6a4e77c24377d6b76 backup_restore=1 multi_instance=1 port_already_use=0 - change_url=1 + change_url=0 ;;; Options Email= Notification=none From 49f2832544f2b499350952fe1d0535cc942932f8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 11 Aug 2023 06:18:40 +0000 Subject: [PATCH 08/14] Upgrade to v2.5.300 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 9c46301..0874c77 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/v2.5.299/wiki-js.tar.gz -SOURCE_SUM=1987b4e5d6d1f11c02ccf79d782314413599e75ae833f5768d43cfbfba3b5045 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/v2.5.300/wiki-js.tar.gz +SOURCE_SUM=0b272ada8781f2fd3656d13928fb34f7ebb366abc66c9447f89e183c3628fb26 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 785e7e8..3045982 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source powerful wiki app built on Node.js, Git and Markdown", "fr": "Wiki open source propulsé par Node.js, Git et Markdown" }, - "version": "2.5.299~ynh1", + "version": "2.5.300~ynh1", "url": "https://wiki.js.org/", "upstream": { "license": "AGPL-3.0-or-later", From deecfdf21ef0cbf591909d91dccfc5cb8e4797ba Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 11 Aug 2023 06:18:46 +0000 Subject: [PATCH 09/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b08cb54..4241238 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.5.299~ynh1 +**Shipped version:** 2.5.300~ynh1 **Demo:** https://docs-beta.requarks.io/ diff --git a/README_fr.md b/README_fr.md index 52f6bf7..520db56 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Version incluse :** 2.5.299~ynh1 +**Version incluse :** 2.5.300~ynh1 **Démo :** https://docs-beta.requarks.io/ From b0d2b79ec36cd617bd5c2ffc192759b5e479cc2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 27 Oct 2023 16:52:49 +0200 Subject: [PATCH 10/14] Update check_process --- check_process | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/check_process b/check_process index 03b6e2c..54cacf9 100644 --- a/check_process +++ b/check_process @@ -10,42 +10,6 @@ setup_private=1 setup_public=1 upgrade=1 - # 2.0.0-beta.303 - #upgrade=1 from_commit=62db8a96750dfd28880126d3eb9228d4d71f0814 - # 2.0.12 - #upgrade=1 from_commit=90fb1a7cb3db812a8b2558673d5f1f22b39becec - # 2.1.113 - #upgrade=1 from_commit=f9dd286ff1d662e4ece78364230fc2fddef721cd - # 2.2.51 - #upgrade=1 from_commit=1898f27765068f49de23e7ba66b1fc23571799dc - # 2.3.77 - #upgrade=1 from_commit=8c74d870a550e99db4b6cac0a695f3155b28b514 - # 2.3.81~ynh1 - #upgrade=1 from_commit=ddb3a60b6f0f8024169db5a79ea07a9ac936b290 - # 2.4.75~ynh1 - #upgrade=1 from_commit=164ef6bac3a65fe075850ec060edcd9c3249f83a - # 2.4.107~ynh1 - #upgrade=1 from_commit=ed3d16ea928155936ecf8753fcc6096a01971e6d - # 2.5.170~ynh2 - #upgrade=1 from_commit=6ee6878a94407749d768ee347f163904537dc945 - # 2.5.191~ynh1 - #upgrade=1 from_commit=f241d2586694d9aff19ae6d67209142faa8b25ca - # 2.5.197~ynh1 - #upgrade=1 from_commit=3c9ab32ee147ef1f39aff2773fc3be506164d873 - # 2.5.201~ynh1 - #upgrade=1 from_commit=bce2bfa3f9f0e28ffdde79df17a34bd5302559ea - # 2.5.201~ynh2 - #upgrade=1 from_commit=17ee20b13ba56babe0231b3f9bd87e9118908838 - # 2.5.201~ynh3 - #upgrade=1 from_commit=16d047d802582d0d6db6d0d7343bd1fc0fb2eebf - # 2.5.214~ynh1 - #upgrade=1 from_commit=078ffc6ade0df8efd2e035c25e36218c163d158d - # 2.5.219~ynh1 - upgrade=1 from_commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924 - # 2.5.219~ynh2 - upgrade=1 from_commit=b59ca572505eb6b4b4f29596100c68808ec143cd - # 2.5.268~ynh1 - upgrade=1 from_commit=de01b48bfee4abff5edcf2fd288d3ff930ccc45a # 2.5.272~ynh1 upgrade=1 from_commit=0721e06b03c1fa384adcade256b1d67c9462d61e # 2.5.299~ynh1 From 4820ffdfcfea2a48dcf37e50d98e34e81927c665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 18 Nov 2023 18:22:59 +0100 Subject: [PATCH 11/14] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 3045982..c38edd2 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.2" }, "multi_instance": true, "services": [ From 56833bb5ed732a41178a8c54bdff37d24d913bb7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 18 Nov 2023 17:23:06 +0000 Subject: [PATCH 12/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4241238..aaed06a 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Wiki.js is a copylefted libre software, modern and powerful wiki app built on No * Official app website: * Official user documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 520db56..ecea5dc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -39,7 +39,7 @@ Wiki.js is a copylefted libre software, modern and powerful wiki app built on No * Site officiel de l’app : * Documentation officielle utilisateur : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From cd19214a36f644f2e239efd58183dbbadb3e4c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 18 Nov 2023 18:23:09 +0100 Subject: [PATCH 13/14] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index c38edd2..fad859d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source powerful wiki app built on Node.js, Git and Markdown", "fr": "Wiki open source propulsé par Node.js, Git et Markdown" }, - "version": "2.5.300~ynh1", + "version": "2.5.300~ynh2", "url": "https://wiki.js.org/", "upstream": { "license": "AGPL-3.0-or-later", From ce6d48a8022c4ac1f5fac8ae0806d8c94b7a7991 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 18 Nov 2023 17:23:21 +0000 Subject: [PATCH 14/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aaed06a..463f3b8 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.5.300~ynh1 +**Shipped version:** 2.5.300~ynh2 **Demo:** https://docs-beta.requarks.io/ diff --git a/README_fr.md b/README_fr.md index ecea5dc..801ea68 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Version incluse :** 2.5.300~ynh1 +**Version incluse :** 2.5.300~ynh2 **Démo :** https://docs-beta.requarks.io/