From 53883a78bde5e9a937cb791d7c93c16942aa38de Mon Sep 17 00:00:00 2001 From: boturon Date: Sun, 6 Jun 2021 00:05:57 +0000 Subject: [PATCH 01/17] Typo: "then" -> "than" Small typo correction. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f81b024..2faadd6 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Just a blogging platform swapon /swapfile echo "/swapfile swap swap defaults 0 0" >> /etc/fstab - 1. This app is multi-instance (you can have more then one Ghost blogging websites on a single YunoHost server) + 1. This app is multi-instance (you can have more than one Ghost blogging websites on a single YunoHost server) ### Installing the Ghost app @@ -68,4 +68,4 @@ or sudo yunohost app upgrade ghost -u https://github.com/YunoHost-Apps/ghost_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** https://yunohost.org/packaging_apps From 86f30b482cd7735cb9488072405420787320f0f1 Mon Sep 17 00:00:00 2001 From: oufmilo Date: Sat, 12 Jun 2021 21:14:16 +0200 Subject: [PATCH 02/17] Update 4.7.0 --- README.md | 2 +- README_fr.md | 2 +- conf/admin.src | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f81b024..bfc0af1 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 Just a blogging platform -**Shipped version:** 4.3.3~ynh1 +**Shipped version:** 4.7.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 37b8a08..01b2665 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 de blogging -**Version incluse :** 4.3.3~ynh1 +**Version incluse :** 4.7.0~ynh1 diff --git a/conf/admin.src b/conf/admin.src index f094281..3bdb91c 100644 --- a/conf/admin.src +++ b/conf/admin.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/TryGhost/Admin/archive/v4.3.3.zip -SOURCE_SUM=b5f6a125ec9c9bf26a5035a39b947f1d520621d5c7994aab6f6bcf54a3bc8e1e +SOURCE_URL=https://github.com/TryGhost/Admin/archive/refs/tags/v4.7.0.zip +SOURCE_SUM=0bd18e13e138b015561609d7b19ddd8623c22c86bf19c6ada3a4267b8c5dbe1c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/conf/app.src b/conf/app.src index 1f1a356..15a9075 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/TryGhost/Ghost/releases/download/v4.3.3/Ghost-4.3.3.zip -SOURCE_SUM=7b3acd2acdbb26521c0ec6c717484c173b8751bcd054018e5a335495426338c8 +SOURCE_URL=https://github.com/TryGhost/Ghost/releases/download/v4.7.0/Ghost-4.7.0.zip +SOURCE_SUM=f7ac9acfadfbb184ec900709bf3906485d731d6a9a8db510a8471be8884fb47f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 2b3061a..305aaa1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Just a blogging platform", "fr": "Plateforme de blogging" }, - "version": "4.3.3~ynh1", + "version": "4.7.0~ynh1", "url": "https://ghost.org/", "upstream": { "license": "MIT", From d822bb496d0e8b9373e956b1713c195e5504ce4f Mon Sep 17 00:00:00 2001 From: oufmilo Date: Sun, 13 Jun 2021 02:10:32 +0200 Subject: [PATCH 03/17] Update check_process --- check_process | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/check_process b/check_process index 956e09b..dd2cc64 100644 --- a/check_process +++ b/check_process @@ -12,10 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 3.19.2 - upgrade=1 from_commit=cf8c367214ef277f40a43489365199725540e021 - # 3.38.2 - upgrade=1 from_commit=6e4b84cabe351f9c62678089f236f1b3bb21d543 + # 4.3.3 + upgrade=1 from_commit=198004df76b0b3ef22a6dfe1b9a2738af62f0786 backup_restore=1 multi_instance=1 change_url=0 @@ -23,7 +21,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=cf8c367214ef277f40a43489365199725540e021 - name=3.19.2 - ; commit=6e4b84cabe351f9c62678089f236f1b3bb21d543 - name=3.38.2 + ; commit=198004df76b0b3ef22a6dfe1b9a2738af62f0786 + name=4.3.3 + From 6806ba2e6addbac5d3806a88e56701ac46d1f57b Mon Sep 17 00:00:00 2001 From: oufmilo Date: Sun, 13 Jun 2021 02:30:08 +0200 Subject: [PATCH 04/17] Fix --others_var --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 2e310e3..acb1e4c 100644 --- a/scripts/install +++ b/scripts/install @@ -144,7 +144,7 @@ popd || ynh_die ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config -ynh_add_systemd_config --others_var="ynh_node_load_PATH ynh_node" +ynh_add_systemd_config="ynh_node_load_PATH ynh_node" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 7d851dd..cf04adc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ fi ynh_script_progression --message="Upgrading systemd configuration..." # Create a dedicated systemd config -ynh_add_systemd_config --others_var="ynh_node_load_PATH ynh_node" +ynh_add_systemd_config="ynh_node_load_PATH ynh_node" #================================================= # GENERIC FINALIZATION From 8b110af58b57f799dc5596a1c3142816f4626e00 Mon Sep 17 00:00:00 2001 From: oufmilo Date: Sun, 13 Jun 2021 02:51:57 +0200 Subject: [PATCH 05/17] Update manifest.json --- manifest.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 305aaa1..e03fd87 100644 --- a/manifest.json +++ b/manifest.json @@ -36,7 +36,7 @@ }, { "name": "path", - "type": "path", + "type": "path", "example": "/blog", "default": "/blog" }, @@ -44,6 +44,9 @@ "name": "is_public", "type": "boolean", "default": true + "help": { + "fr": "Si cochée, votre application sera publique" + } } ] } From 8147e32b7bec0743ed5b1dc6e283d7be60f93295 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sun, 13 Jun 2021 03:23:19 +0200 Subject: [PATCH 06/17] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e03fd87..f54ecd7 100644 --- a/manifest.json +++ b/manifest.json @@ -43,10 +43,10 @@ { "name": "is_public", "type": "boolean", - "default": true + "default": true, "help": { "fr": "Si cochée, votre application sera publique" - } + }, } ] } From d837e3cd2e80119b88060b299ec295941140ecf7 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sun, 13 Jun 2021 03:27:51 +0200 Subject: [PATCH 07/17] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f54ecd7..5d01d6b 100644 --- a/manifest.json +++ b/manifest.json @@ -46,7 +46,7 @@ "default": true, "help": { "fr": "Si cochée, votre application sera publique" - }, + } } ] } From bbef9bc2182fe3c19673865f7a4ce0d56df6b766 Mon Sep 17 00:00:00 2001 From: oufmilo Date: Sun, 13 Jun 2021 03:41:10 +0200 Subject: [PATCH 08/17] Fix ynh_add_config --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index acb1e4c..5d5c5db 100644 --- a/scripts/install +++ b/scripts/install @@ -195,8 +195,8 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_print_info --message="Sending a readme for the admin..." -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/message" -ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="../conf/message" +ynh_add_config --template="$domain" --destination="../conf/message" +ynh_add_config --template="$path_url" --destination="../conf/message" ynh_send_readme_to_admin --app_message="../conf/message" From 26aeda79b4e49e57af84df61e51ed061ea850775 Mon Sep 17 00:00:00 2001 From: oufmilo Date: Sun, 13 Jun 2021 04:10:32 +0200 Subject: [PATCH 09/17] Update --others_var --- scripts/install | 6 +++--- scripts/upgrade | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 5d5c5db..3877da8 100644 --- a/scripts/install +++ b/scripts/install @@ -144,8 +144,8 @@ popd || ynh_die ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config -ynh_add_systemd_config="ynh_node_load_PATH ynh_node" - + ynh_add_systemd_config --others_var="ynh_node_load_PATH ynh_node" + #================================================= # GENERIC FINALIZATION #================================================= @@ -203,5 +203,5 @@ ynh_send_readme_to_admin --app_message="../conf/message" #================================================= # END OF SCRIPT #================================================= - + ynh_script_progression --message="Installation of $app completed" diff --git a/scripts/upgrade b/scripts/upgrade index cf04adc..12c6c3f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,8 +172,8 @@ fi ynh_script_progression --message="Upgrading systemd configuration..." # Create a dedicated systemd config -ynh_add_systemd_config="ynh_node_load_PATH ynh_node" - + ynh_add_systemd_config --others_var="ynh_node_load_PATH ynh_node" + #================================================= # GENERIC FINALIZATION #================================================= From 223e7f68286892be9362cd886805c7d0d999ae81 Mon Sep 17 00:00:00 2001 From: oufmilo Date: Sun, 13 Jun 2021 04:33:08 +0200 Subject: [PATCH 10/17] Fix --others_var --- scripts/install | 4 ++-- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 3877da8..57472e7 100644 --- a/scripts/install +++ b/scripts/install @@ -144,8 +144,8 @@ popd || ynh_die ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config - ynh_add_systemd_config --others_var="ynh_node_load_PATH ynh_node" - + ynh_add_systemd_config --template="$ynh_node_load_PATH" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 12c6c3f..4b5e22a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ fi ynh_script_progression --message="Upgrading systemd configuration..." # Create a dedicated systemd config - ynh_add_systemd_config --others_var="ynh_node_load_PATH ynh_node" + ynh_add_systemd_config --template="$ynh_node_load_PATH" #================================================= # GENERIC FINALIZATION From e6d72ab8707d1cd650be58f9837bca381e31d7a1 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sun, 13 Jun 2021 11:22:55 +0200 Subject: [PATCH 11/17] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 57472e7..8c839ed 100644 --- a/scripts/install +++ b/scripts/install @@ -144,7 +144,7 @@ popd || ynh_die ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config - ynh_add_systemd_config --template="$ynh_node_load_PATH" + ynh_add_systemd_config #================================================= # GENERIC FINALIZATION From ed53f173eff237f80729b66da7e3363b645c364d Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sun, 13 Jun 2021 11:23:25 +0200 Subject: [PATCH 12/17] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4b5e22a..77082fa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,7 +172,7 @@ fi ynh_script_progression --message="Upgrading systemd configuration..." # Create a dedicated systemd config - ynh_add_systemd_config --template="$ynh_node_load_PATH" + ynh_add_systemd_config #================================================= # GENERIC FINALIZATION From 6eed53a30dc9a8132adf800d80c6770988295cb0 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sun, 13 Jun 2021 11:59:48 +0200 Subject: [PATCH 13/17] Update message --- conf/message | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/message b/conf/message index d438dff..d7e0a9b 100644 --- a/conf/message +++ b/conf/message @@ -2,8 +2,8 @@ Ghost was successfully installed :) Next step: -Create admin account at https://__DOMAIN____PATH_URL__/ghost +Create admin account at https://$DOMAIN$PATH_URL/ghost Happy Blogging! -If you are facing any problem, please open an issue here: https://github.com/YunoHost-Apps/ghost_ynh/issues \ No newline at end of file +If you are facing any problem, please open an issue here: https://github.com/YunoHost-Apps/ghost_ynh/issues From 837e962a13cb58cea4daa9d3bd62b29f11b0129c Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sun, 13 Jun 2021 12:23:06 +0200 Subject: [PATCH 14/17] Update message --- conf/message | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/message b/conf/message index d7e0a9b..66cc6a6 100644 --- a/conf/message +++ b/conf/message @@ -2,7 +2,7 @@ Ghost was successfully installed :) Next step: -Create admin account at https://$DOMAIN$PATH_URL/ghost +Create admin account at https://$domain$path_url/ghost Happy Blogging! From 8bea5bfee71d657618cde690b691818aefb63997 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sun, 13 Jun 2021 12:39:16 +0200 Subject: [PATCH 15/17] Update install --- scripts/install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 8c839ed..bb14c9b 100644 --- a/scripts/install +++ b/scripts/install @@ -195,8 +195,9 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_print_info --message="Sending a readme for the admin..." -ynh_add_config --template="$domain" --destination="../conf/message" -ynh_add_config --template="$path_url" --destination="../conf/message" + +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/message" +ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="../conf/message" ynh_send_readme_to_admin --app_message="../conf/message" From c11346b1984017f0680ba82d736ee583e43866a0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 20 Jun 2021 14:41:19 +0200 Subject: [PATCH 16/17] Fix --- conf/message | 2 +- scripts/install | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/message b/conf/message index 66cc6a6..f6ae5b1 100644 --- a/conf/message +++ b/conf/message @@ -2,7 +2,7 @@ Ghost was successfully installed :) Next step: -Create admin account at https://$domain$path_url/ghost +Create admin account at https://__DOMAIN____PATH_URL__/ghost Happy Blogging! diff --git a/scripts/install b/scripts/install index bb14c9b..c464f5d 100644 --- a/scripts/install +++ b/scripts/install @@ -195,7 +195,6 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= ynh_print_info --message="Sending a readme for the admin..." - ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/message" ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="../conf/message" From 1ef208d59470b928fef638082557107ba73aed5b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 20 Jun 2021 12:41:27 +0000 Subject: [PATCH 17/17] Auto-update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a1024d..bfc0af1 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Just a blogging platform swapon /swapfile echo "/swapfile swap swap defaults 0 0" >> /etc/fstab - 1. This app is multi-instance (you can have more than one Ghost blogging websites on a single YunoHost server) + 1. This app is multi-instance (you can have more then one Ghost blogging websites on a single YunoHost server) ### Installing the Ghost app @@ -68,4 +68,4 @@ or sudo yunohost app upgrade ghost -u https://github.com/YunoHost-Apps/ghost_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file