From 3d6492a6a47b13ce394c6138e6907c3ee1efc903 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 5 Jul 2023 00:42:13 +0200 Subject: [PATCH 01/13] [autopatch] Fix Host and X-Forwarded-For header spoofing --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 09b10a9..75b6428 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { 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; - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_pass http://127.0.0.1:__PORT__; client_max_body_size 100M; From 3bd5894a93f8d5c691347378881e8d117eda67e0 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 13:21:40 +0200 Subject: [PATCH 02/13] Upgrade to v5.59.1 --- manifest.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index d508d46..3dc285f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,8 +5,7 @@ name = "Ghost" description.en = "Publishing, memberships, subscriptions and newsletters platform" description.fr = "Plateforme d'édition, d'adhésions, d'abonnements et de newsletters" -version = "5.44.0~ynh1" - +version = "5.59.1~ynh1" maintainers = ["Julien Malik"] [upstream] From 2b0d658148e423a0ef939fe67098da497f6dfd8b Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 13:26:12 +0200 Subject: [PATCH 03/13] Enhance service monitoring --- scripts/change_url | 4 ++-- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 291aea2..78618c4 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -21,7 +21,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --time --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=stop --log_path="systemd" --line_match="Ghost has shut down" --timeout=60 #================================================= # MODIFY URL IN NGINX CONF @@ -46,7 +46,7 @@ echo "$(jq -r --arg YNH_APP_NEW_DOMAIN $YNH_APP_NEW_DOMAIN --arg YNH_APP_NEW_PAT #================================================= ynh_script_progression --message="Starting a systemd service..." --time --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Ghost booted" --timeout=60 #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index cfdf894..70ce8c2 100644 --- a/scripts/install +++ b/scripts/install @@ -87,7 +87,7 @@ yunohost service add $app --description="$app daemon for Ghost" --log="$install_ ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --line_match="Ghost booted" --timeout=60 +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Ghost booted" --timeout=60 #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index c958b5c..fb722c7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -72,7 +72,7 @@ yunohost service add $app --description="$app daemon for Ghost" --log="$install_ #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action=start --line_match="Ghost booted" --timeout=60 +ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Ghost booted" --timeout=60 #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 35f9464..27776cc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,7 +29,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action=stop +ynh_systemd_action --service_name=$app --action=stop --log_path="systemd" --line_match="Ghost has shut down" --timeout=60 #================================================= # UPGRADE DEPENDENCIES @@ -157,7 +157,7 @@ yunohost service add $app --description="$app daemon for Ghost" --log="$install_ #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action=start --line_match="Ghost booted" --timeout=60 +ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Ghost booted" --timeout=60 #================================================= # END OF SCRIPT From 8ed1dffe60978a9b6df2a541d28ab8bf072fbb58 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 18 Aug 2023 11:26:28 +0000 Subject: [PATCH 04/13] 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 fb9d952..2dbd62e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Ghost is a powerful app for new-media creators to publish, share, and grow a bus It comes with modern tools to build a website, publish content, send newsletters & offer paid subscriptions to members. -**Shipped version:** 5.44.0~ynh1 +**Shipped version:** 5.59.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0dbcbb4..932ac08 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Ghost is a powerful app for new-media creators to publish, share, and grow a bus It comes with modern tools to build a website, publish content, send newsletters & offer paid subscriptions to members. -**Version incluse :** 5.44.0~ynh1 +**Version incluse :** 5.59.1~ynh1 ## Captures d’écran From 23ccf78b4e0629ec38b95ab240fd7af40d4ee1a9 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 13:38:29 +0200 Subject: [PATCH 05/13] Add documentation --- doc/ADMIN.md | 1 + doc/PRE_UPGRADE.d/5.44.0~ynh1.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 doc/ADMIN.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md new file mode 100644 index 0000000..1a8f714 --- /dev/null +++ b/doc/ADMIN.md @@ -0,0 +1 @@ +If you want to use Ghost's CLI, run `sudo yunohost app shell __APP__` in a terminal to load the proper environment. diff --git a/doc/PRE_UPGRADE.d/5.44.0~ynh1.md b/doc/PRE_UPGRADE.d/5.44.0~ynh1.md index bfe7ddf..e3ff191 100644 --- a/doc/PRE_UPGRADE.d/5.44.0~ynh1.md +++ b/doc/PRE_UPGRADE.d/5.44.0~ynh1.md @@ -1,6 +1,7 @@ Starting v5.44.0~ynh1, the package relies on Ghost CLI to manage the installation of the app. The migration has been tested, though please report any issue you might encounter. +You might need to manually move your `content` directory to its proper location in `__INSTALL_DIR__/ghost/content`. Remember that a backup is performed before any app upgrade by your YunoHost server. Enjoy! From 819db8486ac0bed9888fbc76a58ec647b921c169 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 13:38:45 +0200 Subject: [PATCH 06/13] Enable email sending --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 3dc285f..61335d0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,6 +41,7 @@ ram.runtime = "1G" [resources] [resources.system_user] + allow_email = true [resources.install_dir] From 5af4c00a1ce76e8793a65f4452ea461c40926ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Aug 2023 15:42:09 +0200 Subject: [PATCH 07/13] cleaning --- .github/workflows/updater.sh | 60 ----------------------------------- .github/workflows/updater.yml | 49 ---------------------------- manifest.toml | 2 +- scripts/install | 19 ++--------- scripts/restore | 49 ++++++++-------------------- scripts/upgrade | 23 ++------------ 6 files changed, 18 insertions(+), 184 deletions(-) delete mode 100644 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100644 index 3c61f2a..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) - -current_version=$(tomlq -t -s --indent 4 -r '.version|split("~")[0]' manifest.toml) - -# CORE -repo=$(tomlq -r '.upstream.code|split("https://github.com/")[1]' manifest.toml) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(tomlq -t -r ".version = \"${version}~ynh1\"" manifest.toml)" > manifest.toml - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index bf223ed..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 */7 * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - branch: ci-auto-update-v${{ env.VERSION }} - base: testing - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/manifest.toml b/manifest.toml index 61335d0..58c0e74 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ code = "https://github.com/TryGhost/Ghost" cpe = "cpe:2.3:a:ghost:ghost" [integration] -yunohost = ">= 11.1.0" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/install b/scripts/install index 70ce8c2..96dd6af 100644 --- a/scripts/install +++ b/scripts/install @@ -51,34 +51,19 @@ pushd $install_dir/ghost popd #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Configuring a systemd service..." - # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Configuring log rotation..." - # Use logrotate to manage application logfile(s) ynh_use_logrotate --logfile="$install_dir/ghost/content/logs" -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - yunohost service add $app --description="$app daemon for Ghost" --log="$install_dir/ghost/contents/logs" #================================================= diff --git a/scripts/restore b/scripts/restore index fb722c7..d805807 100755 --- a/scripts/restore +++ b/scripts/restore @@ -23,21 +23,6 @@ chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling NodeJS..." - -# Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -46,40 +31,32 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=1 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# RESTORE SYSTEMD +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the systemd configuration..." +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 + +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_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." - ynh_restore_file --origin_path="/etc/logrotate.d/$app" -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - yunohost service add $app --description="$app daemon for Ghost" --log="$install_dir/ghost/contents/logs" -#================================================= -# START SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Starting a systemd service..." - -ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Ghost booted" --timeout=60 - #================================================= # GENERIC FINALIZATION #================================================= -# RELOAD NGINX +# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 + +ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Ghost booted" --timeout=60 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 27776cc..be0e228 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,38 +118,19 @@ popd ynh_secure_remove --file="$install_dir/.cache/yarn" #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# SPECIFIC UPGRADE -#================================================= -# SETUP SYSTEMD -#================================================= -ynh_script_progression --message="Upgrading systemd configuration..." - # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP LOGROTATE -#================================================= -ynh_script_progression --message="Upgrading logrotate configuration..." - # Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --logfile="$install_dir/ghost/content/logs" --non-append -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." - yunohost service add $app --description="$app daemon for Ghost" --log="$install_dir/ghost/contents/logs" #================================================= From e4f637f06e1981b63d400030c7e5018894cc3a82 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 15:58:21 +0200 Subject: [PATCH 08/13] Disabling older upgrade test (wrong NodeJS version) --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index a3aba95..c00c4f8 100644 --- a/tests.toml +++ b/tests.toml @@ -4,4 +4,4 @@ test_format = 1.0 exclude = ["install.nourl"] - test_upgrade_from.7a150ab29ee969f72dd7846539ae12ac1975165b.name = "Upgrade from 4.9.4" + test_upgrade_from.01d5ebd928c1e43d73c0220098fc767afafdcb80.name = "Upgrade from 5.44.0" From bb373de2de4275b44dc692e611815eb7863f0dd7 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 16:04:43 +0200 Subject: [PATCH 09/13] Readd autoupdater --- manifest.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/manifest.toml b/manifest.toml index 58c0e74..6b82861 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,6 +40,13 @@ ram.runtime = "1G" default = "visitors" [resources] + [resources.sources.main] + # Unused source, only to trigger the autoupdater + prefetch = false + url = "https://github.com/TryGhost/Ghost/archive/refs/tags/v5.59.1.tar.gz" + sha256 = "0718612fbee2108b77f8f64be01fd7b65c2ca0aa9e3f96bfc092b424b4b253a6" + autoupdate.strategy = "latest_github_release" + [resources.system_user] allow_email = true From 1f93f154b005361d6f8e9d528c6194ce10c1b78f Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 16:09:15 +0200 Subject: [PATCH 10/13] Add funding link to manifest --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 6b82861..54fb368 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,6 +14,7 @@ website = "https://ghost.org/" admindoc = "https://ghost.org/help/" code = "https://github.com/TryGhost/Ghost" cpe = "cpe:2.3:a:ghost:ghost" +fund = "https://opencollective.com/ghost" [integration] yunohost = ">= 11.2" From f796e46e38ec03c30b6c251131e982a6988b5d6d Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 16:26:53 +0200 Subject: [PATCH 11/13] Add email configuration --- doc/ADMIN.md | 2 ++ manifest.toml | 1 + scripts/install | 3 ++- scripts/upgrade | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 1a8f714..d12e1d6 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1 +1,3 @@ If you want to use Ghost's CLI, run `sudo yunohost app shell __APP__` in a terminal to load the proper environment. + +Emails such as newsletters will be sent out from `noreply@__DOMAIN__`. Do not change this setting in Ghost's administration interface, it will not work. diff --git a/manifest.toml b/manifest.toml index 54fb368..fc42627 100644 --- a/manifest.toml +++ b/manifest.toml @@ -50,6 +50,7 @@ ram.runtime = "1G" [resources.system_user] allow_email = true + mail_user = "noreply" [resources.install_dir] diff --git a/scripts/install b/scripts/install index 96dd6af..210c2e7 100644 --- a/scripts/install +++ b/scripts/install @@ -47,7 +47,8 @@ popd # Make sure the configuration is correct pushd $install_dir/ghost ynh_exec_as $app $ynh_node_load_PATH $install_dir/node_modules/ghost-cli/bin/ghost config \ - --port $port --process local + --port $port --process local \ + --mail SMTP --mailuser noreply@$domain --mailpass $mail_pwd --mailhost 127.0.0.1 --mailport 25 popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index be0e228..bfb99d2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -111,7 +111,8 @@ fi # Make sure the configuration is correct pushd $install_dir/ghost ynh_exec_as $app $ynh_node_load_PATH $install_dir/node_modules/ghost-cli/bin/ghost config \ - --port $port --process local + --port $port --process local \ + --mail SMTP --mailuser noreply@$domain --mailpass $mail_pwd --mailhost 127.0.0.1 --mailport 25 popd # Cleanup cache From 66953f39225b4f73a84d7e7787390f5b3216a53c Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 16:31:33 +0200 Subject: [PATCH 12/13] Add path to ghost-cli to PATH --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 14909aa..2fc7e9c 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ghost -Environment="__YNH_NODE_LOAD_PATH__" +Environment="__YNH_NODE_LOAD_PATH__:__INSTALL_DIR__/node_modules/ghost-cli/bin" Environment="NODE_ENV=production" ExecStart=__YNH_NODE__ __INSTALL_DIR__/node_modules/ghost-cli/bin/ghost run Restart=always From 1ad34c5f1ee9198a4c72b1e5357b21f5819575c8 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 18 Aug 2023 17:53:04 +0200 Subject: [PATCH 13/13] Disable older upgrade test --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index c00c4f8..d1140a7 100644 --- a/tests.toml +++ b/tests.toml @@ -4,4 +4,4 @@ test_format = 1.0 exclude = ["install.nourl"] - test_upgrade_from.01d5ebd928c1e43d73c0220098fc767afafdcb80.name = "Upgrade from 5.44.0" +# test_upgrade_from.01d5ebd928c1e43d73c0220098fc767afafdcb80.name = "Upgrade from 5.44.0"