Merge pull request #362 from YunoHost-Apps/testing

Testing
2024-09-03 19:16:02 +02:00 · 2024-07-22 22:31:47 +02:00 · 2024-07-22 22:31:47 +02:00 · a0c336cbc2
commit a0c336cbc2
parent a83f2bb2a9 eaec0196c4
15 changed files with 91 additions and 34 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -5,4 +5,5 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
--- 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.87.2~ynh1
+**Shipped version:** 5.88.1~ynh1

 ## Screenshots

--- a/README_es.md
+++ b/README_es.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.


-**Versión actual:** 5.87.2~ynh1
+**Versión actual:** 5.88.1~ynh1

 ## Capturas

--- a/README_eu.md
+++ b/README_eu.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.


-**Paketatutako bertsioa:** 5.87.2~ynh1
+**Paketatutako bertsioa:** 5.88.1~ynh1

 ## Pantaila-argazkiak

--- 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.87.2~ynh1
+**Version incluse :** 5.88.1~ynh1

 ## Captures d’écran

--- a/README_gl.md
+++ b/README_gl.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.


-**Versión proporcionada:** 5.87.2~ynh1
+**Versión proporcionada:** 5.88.1~ynh1

 ## Capturas de pantalla

--- a/README_id.md
+++ b/README_id.md
@ -0,0 +1,54 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Ghost untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/ghost.svg)](https://ci-apps.yunohost.org/ci/apps/ghost/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/ghost.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/ghost.maintain.svg)
+
+[![Pasang Ghost dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ghost)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Ghost secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+Ghost is a powerful app for new-media creators to publish, share, and grow a business around their content.
+
+It comes with modern tools to build a website, publish content, send newsletters & offer paid subscriptions to members.
+
+
+**Versi terkirim:** 5.88.1~ynh1
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Ghost](./doc/screenshots/screenshot.png)
+
+## :red_circle: Antifitur
+
+- **Arbitrary limitations**: 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
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://ghost.org/>
+- Dokumentasi admin resmi: <https://ghost.org/help/>
+- Repositori kode aplikasi hulu: <https://github.com/TryGhost/Ghost>
+- Gudang YunoHost: <https://apps.yunohost.org/app/ghost>
+- Laporkan bug: <https://github.com/YunoHost-Apps/ghost_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/ghost_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/ghost_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade ghost -u https://github.com/YunoHost-Apps/ghost_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.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.


-**分发版本：** 5.87.2~ynh1
+**分发版本：** 5.88.1~ynh1

 ## 截图

--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +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.87.2~ynh1"
+version = "5.88.1~ynh1"
 maintainers = []

 [upstream]
@ -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
@ -47,8 +47,8 @@ ram.runtime = "1G"
    [resources.sources.main]
    # Unused source, only to trigger the autoupdater
    prefetch = false
-    url = "https://github.com/TryGhost/Ghost/archive/refs/tags/v5.87.2.tar.gz"
-    sha256 = "57ea28f90a868a498301208993a693f19f58d570d8fc7aabd022148a08826eb0"
+    url = "https://github.com/TryGhost/Ghost/archive/refs/tags/v5.88.1.tar.gz"
+    sha256 = "3d14cf2caf24e3d09a4d6be784c5801748b6cac9fd72362a6eb7a9892d516608"
    autoupdate.strategy = "latest_github_release"

    [resources.system_user]
@ -64,7 +64,12 @@ ram.runtime = "1G"
    [resources.ports]

    [resources.apt]
-    packages = "mailutils mariadb-server"
+    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"
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================

-NODEJS_VERSION=18
+nodejs_version=18

 #=================================================
 # PERSONAL HELPERS
--- 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"
--- 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
--- a/scripts/remove
+++ b/scripts/remove
@ -29,7 +29,6 @@ ynh_remove_nginx_config

 ynh_remove_logrotate

-
 #=================================================
 # END OF SCRIPT
 #=================================================
--- 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
--- 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