From 4d3f39406fcbd5867b59ba5db691c042f9a1262f Mon Sep 17 00:00:00 2001 From: antoine claval Date: Fri, 12 Jan 2024 01:09:34 -0600 Subject: [PATCH 1/6] Bump ruby to 3.0.0 (#168) * Auto-update README * Bump ruby to 3.0.0 --------- Co-authored-by: JimboJoe Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- scripts/_common.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f1a5d99..712f57f 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ systemctl restart discourse * Official app website: * 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 74bad4c..8df1f33 100644 --- a/README_fr.md +++ b/README_fr.md @@ -197,7 +197,7 @@ systemctl restart discourse * Site officiel de l’app : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs diff --git a/scripts/_common.sh b/scripts/_common.sh index 10d395d..5b9f7ca 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="postgresql postgresql-client postgresql-contrib imagemagick libjemalloc1|libjemalloc2" build_pkg_dependencies="libcurl4-openssl-dev libyaml-dev libxml2-dev libpq-dev libreadline-dev brotli libunwind-dev libtcmalloc-minimal4 cmake pngcrush pngquant advancecomp jhead jpegoptim libjpeg-turbo-progs optipng" -ruby_version="2.7.6" +ruby_version="3.0.0" nodejs_version="16" From 74ba5bfa62fc66026b2b64e6526e584cc39d746e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 12 Jan 2024 08:13:47 +0100 Subject: [PATCH 2/6] Update nginx.conf --- conf/nginx.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5c95f86..a1dfbf9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -48,7 +48,7 @@ location = __PATH__/srv/status { access_log off; log_not_found off; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Request-Start "t=${msec}"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -93,7 +93,7 @@ # # proxy_set_header DOES NOT inherit, by design, we must repeat it, # otherwise headers are not set correctly - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Request-Start "t=${msec}"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -125,7 +125,7 @@ } location ~ ^/admin/backups/ { - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Request-Start "t=${msec}"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -140,7 +140,7 @@ # acceleration for backups and avatars # see note about repetition above location ~ ^/(letter_avatar/|user_avatar|highlight-js|stylesheets|favicon/proxied|service-worker) { - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Request-Start "t=${msec}"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -183,7 +183,7 @@ # we need buffering off for message bus location __PATH__/message-bus/ { proxy_set_header X-Request-Start "t=${msec}"; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; @@ -204,7 +204,7 @@ location @__NAME__ { more_set_headers "Referrer-Policy : no-referrer-when-downgrade"; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_set_header X-Request-Start "t=${msec}"; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From ba08d8e4c324b0c822feb7dabb5acc45a54116df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 Jan 2024 20:08:50 +0100 Subject: [PATCH 3/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index fa71c31..7ef2b34 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Discussion platform", "fr": "Plateforme de discussion" }, - "version": "2.8.14~ynh1", + "version": "2.8.14~ynh2", "url": "http://Discourse.org", "upstream": { "license": "GPL-2.0", From 9d051a6a5fe283932e1a6a051e310d50fad1f350 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 Jan 2024 19:08:54 +0000 Subject: [PATCH 4/6] 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 712f57f..9bc981f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Discourse is modern forum software for your community. Use it as a mailing list, discussion forum, long-form chat room, and more! -**Shipped version:** 2.8.14~ynh1 +**Shipped version:** 2.8.14~ynh2 **Demo:** https://try.discourse.org diff --git a/README_fr.md b/README_fr.md index 8df1f33..b6853e7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Discourse est un logiciel de forum moderne pour votre communauté. Utilisez-le comme liste de diffusion, forum de discussion, salle de discussion longue durée, et plus encore ! -**Version incluse :** 2.8.14~ynh1 +**Version incluse :** 2.8.14~ynh2 **Démo :** https://try.discourse.org From bd1b6c35ca2356d80898e420a52e6605698da11b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 Jan 2024 20:09:04 +0100 Subject: [PATCH 5/6] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 98cb36b..07816e4 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_public=1 upgrade=1 # 2.8.8~ynh1 - upgrade=1 from_commit=ec974723113fa8f984af8ab47d1cc99765ae6c2f + #upgrade=1 from_commit=ec974723113fa8f984af8ab47d1cc99765ae6c2f backup_restore=1 # Activate multi-instance test only if you have more than 2Gb RAM! multi_instance=0 From c2045555f3ccbaf01465957b67ef3cc27d549fa7 Mon Sep 17 00:00:00 2001 From: ljf Date: Wed, 31 Jan 2024 23:35:21 +0100 Subject: [PATCH 6/6] [fix] Upgrade test from 2.8 --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 07816e4..f804f25 100644 --- a/check_process +++ b/check_process @@ -12,8 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 2.8.8~ynh1 - #upgrade=1 from_commit=ec974723113fa8f984af8ab47d1cc99765ae6c2f + # 2.8.8~ynh3 + upgrade=1 from_commit=80476a5622a7baabc40ae06be33ed27398139b87 backup_restore=1 # Activate multi-instance test only if you have more than 2Gb RAM! multi_instance=0 @@ -23,6 +23,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=ec974723113fa8f984af8ab47d1cc99765ae6c2f + ; commit=80476a5622a7baabc40ae06be33ed27398139b87 name=2.8.8~ynh1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1