From 9a2b70e18e2e349f590bf0af3d697f134d55e4ad Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 20 Nov 2021 06:19:04 +0000 Subject: [PATCH 1/4] Upgrade to v4.22.4 --- conf/admin.src | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/admin.src b/conf/admin.src index 7302d82..e9fd9d1 100644 --- a/conf/admin.src +++ b/conf/admin.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/TryGhost/Admin/archive/refs/tags/v4.22.0.zip -SOURCE_SUM=f1b2d174c8195eed71bdccec1887e85b96d6be4e7e11eb587b5d8e6c44e5bbbe +SOURCE_URL=https://github.com/TryGhost/Admin/archive/refs/tags/v4.22.4.zip +SOURCE_SUM=47da099f59271d1969e22714309f68b88dbb95e10d62de40f997f62cb326c1e0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/app.src b/conf/app.src index 38069ef..cca4cb8 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/TryGhost/Ghost/releases/download/v4.22.0/Ghost-4.22.0.zip -SOURCE_SUM=4b1d3952ec87036ecb0a5dd5210a9b5a6e7aea53535075aae46e784be048a63c +SOURCE_URL=https://github.com/TryGhost/Ghost/releases/download/v4.22.4/Ghost-4.22.4.zip +SOURCE_SUM=eba4781f6a03ebb7e2bbb0eb1da03839872106ad8f23b83e380fc4b9f6763322 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index b24af80..593436b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Publishing, memberships, subscriptions and newsletters platform", "fr": "Plateforme d'édition, d'adhésions, d'abonnements et de newsletters" }, - "version": "4.22.0~ynh1", + "version": "4.22.4~ynh1", "url": "https://ghost.org/", "upstream": { "license": "MIT", From 722ec543df59ea85105a12874c83172f03a17821 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 20 Nov 2021 06:19:08 +0000 Subject: [PATCH 2/4] 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 c8c97b0..9a13793 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Publishing, memberships, subscriptions and newsletters platform -**Shipped version:** 4.22.0~ynh1 +**Shipped version:** 4.22.4~ynh1 diff --git a/README_fr.md b/README_fr.md index e32fe9a..b7155d4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme d'édition, d'adhésions, d'abonnements et de newsletters -**Version incluse :** 4.22.0~ynh1 +**Version incluse :** 4.22.4~ynh1 From 1cedee1f1b96387e54dbf2a1019430c254a1f659 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 20 Nov 2021 10:40:08 +0100 Subject: [PATCH 3/4] Fix --- conf/nginx.conf | 5 ----- manifest.json | 2 +- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1fdf0f5..09b10a9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,11 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Real-IP $remote_addr; diff --git a/manifest.json b/manifest.json index 593436b..88caaaa 100644 --- a/manifest.json +++ b/manifest.json @@ -20,7 +20,7 @@ "email": "julien.malik@paraiso.me" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index b95208f..60de6d0 100644 --- a/scripts/install +++ b/scripts/install @@ -135,10 +135,10 @@ pushd "$final_path" ynh_use_nodejs ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install --non-interactive ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn add knex-migrator - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV=production $final_path/node_modules/.bin/knex-migrator init + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $final_path/node_modules/.bin/knex-migrator init ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn add grunt-cli ember-cli - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV=production $final_path/node_modules/.bin/grunt symlink - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV=production $final_path/node_modules/.bin/grunt init --force + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $final_path/node_modules/.bin/grunt symlink + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $final_path/node_modules/.bin/grunt init --force popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 725465f..a37efb8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -164,10 +164,10 @@ then pushd "$final_path" ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install --non-interactive ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn add knex-migrator - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV=production $final_path/node_modules/.bin/knex-migrator init + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $final_path/node_modules/.bin/knex-migrator init ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn add grunt-cli ember-cli - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV=production $final_path/node_modules/.bin/grunt symlink - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH NODE_ENV=production $final_path/node_modules/.bin/grunt init --force + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $final_path/node_modules/.bin/grunt symlink + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $final_path/node_modules/.bin/grunt init --force popd fi From 690d962e254d2ba4999e7d06a83e6475eabb5135 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 20 Nov 2021 12:47:42 +0100 Subject: [PATCH 4/4] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 7011b1e..eb579aa 100644 --- a/check_process +++ b/check_process @@ -13,8 +13,8 @@ upgrade=1 # 4.9.4 upgrade=1 from_commit=7a150ab29ee969f72dd7846539ae12ac1975165b - # 4.17.1 - upgrade=1 from_commit=09f260c04435df35edca042486b6a8eb3160333b + # 4.17.1, disabled due to failing in v4.3 + # upgrade=1 from_commit=09f260c04435df35edca042486b6a8eb3160333b backup_restore=1 multi_instance=1 change_url=0