From 450a1199ab3e30e6ff470e2a4682a54528941c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:42:50 +0200 Subject: [PATCH 1/5] fix --- manifest.toml | 4 ++-- scripts/install | 18 ++++++------------ scripts/remove | 1 - scripts/upgrade | 16 ++++++++-------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/manifest.toml b/manifest.toml index e0908c0..1c9a479 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ fund = "https://opencollective.com/ghost" arbitrary-limitations.en = "Ghost developers have chosen to only support MySQL. YunoHost relying on MariaDB, incompatibilities may arise. For more information: https://github.com/TryGhost/Ghost/issues/15729#issuecomment-1299297720" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.20" architectures = "all" multi_instance = true ldap = false @@ -64,7 +64,7 @@ ram.runtime = "1G" [resources.ports] [resources.apt] - packages = "mailutils mariadb-server" + packages = "mailutils, mariadb-server" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 573f726..f35567f 100644 --- a/scripts/install +++ b/scripts/install @@ -12,26 +12,20 @@ source /usr/share/yunohost/helpers #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing NodeJS dependencies..." +ynh_script_progression --message="Installing NodeJS..." --weight=3 -# Install Nodejs -ynh_install_nodejs --nodejs_version=$NODEJS_VERSION - -# Upgrade NPM -ynh_npm install --global npm@latest - -# Install Yarn -ynh_npm install --global yarn +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Install Ghost-CLI - mkdir -p $install_dir/ghost chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" pushd $install_dir - ynh_script_progression --message="Installing and configuring Ghost..." + ynh_script_progression --message="Installing and configuring $app..." + ynh_use_nodejs + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install npm@latest ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install ghost-cli@latest ynh_exec_as $app $ynh_node_load_PATH $install_dir/node_modules/ghost-cli/bin/ghost install $(ynh_app_upstream_version) \ --no-prompt --no-setup-systemd --no-start \ @@ -65,7 +59,7 @@ fi #================================================= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config # Create a dedicated systemd config diff --git a/scripts/remove b/scripts/remove index 77326c6..2438650 100644 --- a/scripts/remove +++ b/scripts/remove @@ -29,7 +29,6 @@ ynh_remove_nginx_config ynh_remove_logrotate - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index df7632b..87472d8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,17 +39,13 @@ ynh_script_progression --message="Stopping a systemd service..." ynh_systemd_action --service_name=$app --action=stop --log_path="systemd" --line_match="Ghost has shut down" --timeout=60 + #================================================= # UPGRADE DEPENDENCIES #================================================= -# Install Nodejs -ynh_install_nodejs --nodejs_version=$NODEJS_VERSION +ynh_script_progression --message="Updating NodeJS..." --weight=1 -# Upgrade NPM -ynh_npm install --global npm@latest - -# Install Yarn -ynh_npm install --global yarn +ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version" #================================================= # UPGRADE @@ -60,7 +56,7 @@ ynh_npm install --global yarn if ynh_compare_current_package_version --comparison le --version 5.26.4~ynh1 then - ynh_script_progression --message="Upgrading from older packaging of Ghost..." + ynh_script_progression --message="Upgrading from older packaging of $app..." # Create a temporary directory tmpdir="$(mktemp -d)" @@ -86,6 +82,8 @@ then chown -R $app:www-data "$install_dir" pushd $install_dir + ynh_use_nodejs + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install npm@latest ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install ghost-cli@latest ynh_exec_as $app $ynh_node_load_PATH $install_dir/node_modules/ghost-cli/bin/ghost install $(ynh_app_upstream_version) \ --no-prompt --no-setup-systemd --no-start \ @@ -105,6 +103,8 @@ else # Upgrade Ghost CLI pushd $install_dir + ynh_use_nodejs + ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install npm@latest ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install ghost-cli@latest popd From 9ef5bbbb2a79fda011c8b5cdba55e7073b2f3687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:46:03 +0200 Subject: [PATCH 2/5] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 702e69f..9195d57 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -NODEJS_VERSION=18 +nodejs_version=18 #================================================= # PERSONAL HELPERS From 8106b12fdbe4eeab6590d37cfdae06b53a02e333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:47:10 +0200 Subject: [PATCH 3/5] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index d805807..f8fca35 100755 --- a/scripts/restore +++ b/scripts/restore @@ -40,7 +40,7 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" # Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet From 3cdae2beabf9fc4b26ed4fedb0753952c4a601f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:52:14 +0200 Subject: [PATCH 4/5] Update manifest.toml --- manifest.toml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manifest.toml b/manifest.toml index 1c9a479..aa4951f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -66,5 +66,10 @@ ram.runtime = "1G" [resources.apt] packages = "mailutils, mariadb-server" + [resources.apt.extras.yarn] + repo = "deb https://dl.yarnpkg.com/debian/ stable main" + key = "https://dl.yarnpkg.com/debian/pubkey.gpg" + packages = ["yarn"] + [resources.database] type = "mysql" From e245246c47f2227972fe5f4eff9df3c8335a026e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 22 Jul 2024 20:04:31 +0200 Subject: [PATCH 5/5] Update backup --- scripts/backup | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/backup b/scripts/backup index 52859db..6d95d0a 100755 --- a/scripts/backup +++ b/scripts/backup @@ -17,6 +17,10 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" +#================================================= +# SYSTEM CONFIGURATION +#================================================= + ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/logrotate.d/$app"