From 5c9b053299607c4fbfb9262eb54dcd6d1ca09d56 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 23 Jan 2021 16:42:10 +0100
Subject: [PATCH] Upgrade to version 3.40.5

---
 README.md                |  2 +-
 check_process            |  4 ++++
 conf/app.src             |  4 ++--
 manifest.json            |  2 +-
 pull_request_template.md |  4 +---
 scripts/_common.sh       |  2 +-
 scripts/install          | 12 +-----------
 scripts/upgrade          |  5 -----
 8 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 15f4885..14850a8 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Ghost is a fully open source, adaptable platform for building and running a modern online publication.
 
-**Shipped version:** 3.40.2
+**Shipped version:** 3.40.5
 
 ## Screenshots
 
diff --git a/check_process b/check_process
index 54090eb..9f5cd9a 100644
--- a/check_process
+++ b/check_process
@@ -19,6 +19,8 @@
 		upgrade=1
 		# 3.19.2
 		upgrade=1	from_commit=cf8c367214ef277f40a43489365199725540e021
+		# 3.38.2
+		upgrade=1	from_commit=6e4b84cabe351f9c62678089f236f1b3bb21d543
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
@@ -29,3 +31,5 @@ Notification=none
 ;;; Upgrade options
 	; commit=cf8c367214ef277f40a43489365199725540e021
 		name=3.19.2
+	; commit=6e4b84cabe351f9c62678089f236f1b3bb21d543
+		name=3.38.2
diff --git a/conf/app.src b/conf/app.src
index 0a6c6bc..17078a1 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/TryGhost/Ghost/releases/download/3.40.2/Ghost-3.40.2.zip
-SOURCE_SUM=adec82d930c9b50d5171afdf70423adb4aa2ed6e30338540b7cd38594bb6a6f2
+SOURCE_URL=https://github.com/TryGhost/Ghost/releases/download/3.40.5/Ghost-3.40.5.zip
+SOURCE_SUM=fef81257937b9125dac1618d4a8433a651aa6d32dcfc69da78a4610d7fcbc8ad
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index 7f8cc6c..d0db237 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Just a blogging platform",
         "fr": "Plateforme de blogging"
     },
-    "version": "3.40.2~ynh1",
+    "version": "3.40.5~ynh1",
     "url": "https://ghost.org/",
     "license": "MIT",
     "maintainer": {
diff --git a/pull_request_template.md b/pull_request_template.md
index 0c45f32..6c28fc5 100644
--- a/pull_request_template.md
+++ b/pull_request_template.md
@@ -13,6 +13,4 @@
 
 ## Package_check results
 ---
-*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
-
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/ghost_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/ghost_ynh%20PR-NUM-%20(USERNAME)/)  
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6372d83..3376c2d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,7 @@
 # dependencies used by the app
 pkg_dependencies="mailutils"
 
-NODEJS_VERSION=12
+NODEJS_VERSION=14
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 2cc4e08..98eef52 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,11 +102,6 @@ ynh_script_progression --message="Configuring NGINX web server..."
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
-if [ "$path_url" != "/" ]
-then
-	ynh_replace_string "^#sub_path_only" "" "/etc/nginx/conf.d/$domain.d/$app.conf"
-fi
-ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # CREATE DEDICATED USER
@@ -180,14 +175,9 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
 #=================================================
 ynh_script_progression --message="Configuring SSOwat..."
 
-if [ $is_public -eq 0 ]
-then	# Remove the public access
-	ynh_app_setting_delete $app skipped_uris
-fi
-# Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
+	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5f9f31e..8630339 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -117,11 +117,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
-if [ "$path_url" != "/" ]
-then
-	ynh_replace_string "^#sub_path_only" "" "/etc/nginx/conf.d/$domain.d/$app.conf"
-fi
-ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # UPGRADE DEPENDENCIES