From e54715a2488a61ea49205b20dccbb668919e6655 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 20 Mar 2019 23:59:18 +0100 Subject: [PATCH 1/2] Fix EXTERNAL_URI during upgrade --- scripts/upgrade | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d88779f..b48c5a2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -146,9 +146,16 @@ popd cp "../conf/.env" "$final_path/.env" +if [ "$path_url" == "/" ] +then + domain_uri="$domain" +else + domain_uri="$domain$path_url" +fi + ynh_replace_string "__NODEJS_PATH__" "$nodejs_path" "$final_path/.env" ynh_replace_string "__PORT__" "$port" "$final_path/.env" -ynh_replace_string "__DOMAIN_URI__" "$domain$path_url" "$final_path/.env" +ynh_replace_string "__DOMAIN_URI__" "$domain_uri" "$final_path/.env" ynh_replace_string "__FINALPATH__" "$final_path" "$final_path/.env" ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. From 26d33e024b35e53ece3bd40d2775a97870e76721 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 21 Mar 2019 00:19:15 +0100 Subject: [PATCH 2/2] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 462506c..b88c2b1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Distributed pastebin with ActivityPub.", "fr": "Pastebin distribué utilisant le protocole ActivityPub." }, - "version": "1.2.0~ynh2", + "version": "1.2.0~ynh3", "url": "https://example.com", "license": "Apache-2.0", "maintainer": {