From dd7c82a1f8e193e3221a9b76aca8cd5637c2441f Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 29 Jul 2024 14:51:06 +0200 Subject: [PATCH 1/5] Upgrade to v0.1.2024.07.26 (#49) * Upgrade sources - `main` v0.1.2024.07.26: https://github.com/toptal/haste-server/compare/87a6a88449db1e1e048bf58223038b8df83846c8...a56763258b9a4a8fd589484351f027599a4f3515 * Auto-update READMEs --- ALL_README.md | 1 + README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_id.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 4 ++-- manifest.toml | 6 +++--- 9 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- 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) diff --git a/README.md b/README.md index 7d815c6..61b0586 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Haste for YunoHost -[![Integration level](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![Working status](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![Working status](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) [![Install Haste with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Haste is an open-source pastebin software written in node.js, which is easily installable in any network. YunoHost Project uses Haste as pastebin for log sharing: [paste.yunohost.org](https://paste.yunohost.org/) -**Shipped version:** 0.1.2023.09.21~ynh2 +**Shipped version:** 0.1.2024.07.26~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index b71562c..91e02a1 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Haste para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) [![Instalar Haste con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) @@ -19,7 +19,7 @@ No se debe editar a mano. Haste is an open-source pastebin software written in node.js, which is easily installable in any network. YunoHost Project uses Haste as pastebin for log sharing: [paste.yunohost.org](https://paste.yunohost.org/) -**Versión actual:** 0.1.2023.09.21~ynh2 +**Versión actual:** 0.1.2024.07.26~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 624edf8..d28324d 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Haste YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) [![Instalatu Haste YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) @@ -19,7 +19,7 @@ EZ editatu eskuz. Haste is an open-source pastebin software written in node.js, which is easily installable in any network. YunoHost Project uses Haste as pastebin for log sharing: [paste.yunohost.org](https://paste.yunohost.org/) -**Paketatutako bertsioa:** 0.1.2023.09.21~ynh2 +**Paketatutako bertsioa:** 0.1.2024.07.26~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index b1c2c10..bacdf68 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Haste pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) [![Installer Haste avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Haste est un logiciel pastebin open-source écrit en node.js, facilement installable sur n'importe quel réseau. Le projet YunoHost utilise Haste comme pastebin pour le partage de log : [paste.yunohost.org](https://paste.yunohost.org/) -**Version incluse :** 0.1.2023.09.21~ynh2 +**Version incluse :** 0.1.2024.07.26~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 2f4ca94..6df478a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Haste para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) [![Instalar Haste con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) @@ -19,7 +19,7 @@ NON debe editarse manualmente. Haste is an open-source pastebin software written in node.js, which is easily installable in any network. YunoHost Project uses Haste as pastebin for log sharing: [paste.yunohost.org](https://paste.yunohost.org/) -**Versión proporcionada:** 0.1.2023.09.21~ynh2 +**Versión proporcionada:** 0.1.2024.07.26~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..f528366 --- /dev/null +++ b/README_id.md @@ -0,0 +1,50 @@ + + +# Haste untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) + +[![Pasang Haste dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Haste 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 + +Haste is an open-source pastebin software written in node.js, which is easily installable in any network. YunoHost Project uses Haste as pastebin for log sharing: [paste.yunohost.org](https://paste.yunohost.org/) + + +**Versi terkirim:** 0.1.2024.07.26~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada Haste](./doc/screenshots/screenshot.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi pengguna resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/haste_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/haste_ynh/tree/testing --debug +atau +sudo yunohost app upgrade haste -u https://github.com/YunoHost-Apps/haste_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index bae40b2..acc280f 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Haste -[![集成程度](https://dash.yunohost.org/integration/haste.svg)](https://dash.yunohost.org/appci/app/haste) ![工作状态](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) [![使用 YunoHost 安装 Haste](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) @@ -19,7 +19,7 @@ Haste is an open-source pastebin software written in node.js, which is easily installable in any network. YunoHost Project uses Haste as pastebin for log sharing: [paste.yunohost.org](https://paste.yunohost.org/) -**分发版本：** 0.1.2023.09.21~ynh2 +**分发版本：** 0.1.2024.07.26~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 4e3b7c1..3efffd9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Haste" description.en = "Open-source pastebin allowing to upload texts" description.fr = "Pastebin open-source permettant de mettre en ligne du texte" -version = "0.1.2023.09.21~ynh2" +version = "0.1.2024.07.26~ynh1" maintainers = ["eric_G"] @@ -41,8 +41,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/toptal/haste-server/archive/87a6a88449db1e1e048bf58223038b8df83846c8.tar.gz" - sha256 = "729cdff777daa04ccc277670a94e2e8e5d7bf4cd1bf63730d3436bca5d05dd6d" + url = "https://github.com/toptal/haste-server/archive/a56763258b9a4a8fd589484351f027599a4f3515.tar.gz" + sha256 = "047abbe159e3a8f68d53937f052bdcfdaa86ff831ef04a545950464b26cdfd5c" autoupdate.strategy = "latest_github_commit" autoupdate.force_version = "0.1.%Y.%m.%d" From 0e1eafe7e046c316ae40a96790ad43574855b798 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 31 Aug 2024 12:29:36 +0200 Subject: [PATCH 2/5] [autopatch] Automatic patch attempt for helpers 2.1 (#51) * Upgrade to v0.1.2024.07.26 (#49) (#50) * Upgrade sources - `main` v0.1.2024.07.26: https://github.com/toptal/haste-server/compare/87a6a88449db1e1e048bf58223038b8df83846c8...a56763258b9a4a8fd589484351f027599a4f3515 * Auto-update READMEs Co-authored-by: YunoHost Bot * [autopatch] Automatic patch attempt for helpers 2.1 * cleaning --------- Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Yunohost-Bot <> --- conf/systemd.service | 2 +- manifest.toml | 3 ++- scripts/_common.sh | 14 +------------ scripts/backup | 26 ++++++++--------------- scripts/change_url | 24 +++++++--------------- scripts/install | 48 +++++++++++++++---------------------------- scripts/remove | 27 ++++++++---------------- scripts/restore | 42 +++++++++++++++---------------------- scripts/upgrade | 49 +++++++++++++++----------------------------- 9 files changed, 77 insertions(+), 158 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index ac28b34..b7b4887 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__ Environment="PATH=__ENV_PATH__" -ExecStart=__YNH_NPM__ start +ExecStart=__NODEJS_DIR__/npm start StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit Restart=always diff --git a/manifest.toml b/manifest.toml index 3efffd9..2a37511 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,8 @@ userdoc = "https://hastebin.com/about.md" code = "https://github.com/toptal/haste-server" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.18" +helpers_version = "2.1" architectures = "all" multi_instance = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 9195d57..e3290b0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,19 +1,7 @@ #!/bin/bash #================================================= -# COMMON VARIABLES +# COMMON VARIABLES AND CUSTOM HELPERS #================================================= nodejs_version=18 - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= diff --git a/scripts/backup b/scripts/backup index a8196c4..9f1f029 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,46 +1,36 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= # BACKUP DATA_DIR DIRECTORY #================================================= -ynh_backup --src_path="$data_dir" --is_big +ynh_backup "$data_dir" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_backup --src_path="/etc/logrotate.d/$app" +ynh_backup "/etc/logrotate.d/$app" -ynh_backup --src_path="/usr/bin/$app" +ynh_backup "/usr/bin/$app" -ynh_backup --src_path="/etc/systemd/system/$app.service" +ynh_backup "/etc/systemd/system/$app.service" #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 88c026d..1cdd01d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,41 +1,31 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD MODIFICATIONS #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression "Stopping $app's systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemctl --service=$app --action="stop" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 +ynh_script_progression "Updating NGINX web server configuration..." -ynh_change_url_nginx_config +ynh_config_change_url_nginx -#================================================= -# GENERIC FINALISATION #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=2 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" +ynh_systemctl --service=$app --action=start #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index 615d5d3..ef13462 100755 --- a/scripts/install +++ b/scripts/install @@ -1,70 +1,59 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # INSTALL NODEJS #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=10 +ynh_script_progression "Installing dependencies..." # Install Nodejs -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_nodejs_install #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=2 +ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$install_dir #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 +ynh_script_progression "Configuring NGINX web server..." -# Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx env_path="$PATH" -ynh_add_systemd_config +ynh_config_add_systemd -# FIXME Currently, the log is only redirected to syslog. mkdir -p /var/log/$app touch /var/log/$app/$app.log -chown $app -R /var/log/$app -ynh_use_logrotate +ynh_config_add_logrotate yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" #================================================= # CONFIGURE HASTE #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +ynh_script_progression "Adding $app's configuration..." -ynh_add_config --template="config.js" --destination="$install_dir/config.js" +ynh_config_add --template="config.js" --destination="$install_dir/config.js" # Replace ajax.googleapis by local file cp ../sources/jquery.min.js "$install_dir/static/jquery.min.js" -ynh_replace_string --match_string="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" --replace_string="jquery.min.js" --target_file="$install_dir/static/index.html" +ynh_replace --match="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" --replace="jquery.min.js" --file="$install_dir/static/index.html" #================================================= # INSTALL HASTEBIN #================================================= -ynh_script_progression --message="Installing $app..." --weight=5 +ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_use_nodejs - ynh_exec_warn_less $ynh_npm install + ynh_hide_warnings $ynh_npm install popd #================================================= @@ -72,29 +61,24 @@ popd #================================================= haste_url="${domain}${path}" -ynh_add_config --template="haste.sh" --destination="/usr/bin/$app" +ynh_config_add --template="haste.sh" --destination="/usr/bin/$app" -#================================================= -# GENERIC FINALIZATION #================================================= # SECURE FILES AND DIRECTORIES #================================================= -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" chmod +x /usr/bin/$app #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=2 +ynh_script_progression "Starting $app's systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" +ynh_systemctl --service=$app --action=start #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 17c3382..5e81f8e 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,40 +1,31 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 +ynh_script_progression "Removing system configurations related to $app..." -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null +if ynh_hide_warnings yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --weight=1 + ynh_script_progression "Removing $app service integration..." yunohost service remove $app fi -# Remove the dedicated systemd config -ynh_remove_systemd_config +ynh_config_remove_systemd -# Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx -ynh_remove_logrotate +ynh_config_remove_logrotate -ynh_secure_remove --file="/usr/bin/$app" +ynh_safe_rm "/usr/bin/$app" -ynh_remove_nodejs +ynh_nodejs_remove #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index d1a23dc..96c72ea 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,46 +1,37 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= # INSTALL NODEJS #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +ynh_script_progression "Reinstalling dependencies..." -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_nodejs_install #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=6 +ynh_script_progression "Restoring the app main directory..." -ynh_restore_file --origin_path="$install_dir" - -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +ynh_restore "$install_dir" #================================================= # RESTORE VARIOUS FILES #================================================= -ynh_script_progression --message="Restoring the data directory..." --weight=1 +ynh_script_progression "Restoring the data directory..." -ynh_restore_file --origin_path="$data_dir" --not_mandatory +ynh_restore "$data_dir" chown -R $app:www-data "$data_dir" #================================================= # RESTORE BINARY #================================================= -ynh_script_progression --message="Restoring various files..." --weight=1 +ynh_script_progression "Restoring various files..." -ynh_restore_file --origin_path="/usr/bin/$app" +ynh_restore "/usr/bin/$app" chmod +x /usr/bin/$app #================================================= @@ -49,18 +40,17 @@ chmod +x /usr/bin/$app mkdir -p /var/log/$app touch /var/log/$app/$app.log -chown $app -R /var/log/$app #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 +ynh_script_progression "Integrating service in YunoHost..." -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/logrotate.d/$app" +ynh_restore "/etc/logrotate.d/$app" -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" +ynh_restore "/etc/systemd/system/$app.service" systemctl enable $app.service --quiet yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" @@ -68,14 +58,14 @@ yunohost service add $app --description="Haste is a pastebin software" --log="/v #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" +ynh_systemctl --service=$app --action=start -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index 126e5fd..41f3929 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,60 +1,50 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression "Stopping $app's systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemctl --service=$app --action="stop" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." --weight=7 +ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep="config.js" #================================================= # UPGRADE NODEJS #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=8 +ynh_script_progression "Upgrading dependencies..." -ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version +ynh_nodejs_install #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 +ynh_script_progression "Upgrading NGINX web server configuration..." -# Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx -# FIXME Currently, the log is only redirected to syslog. -ynh_use_logrotate --non-append +ynh_config_add_logrotate env_path="$PATH" -ynh_add_systemd_config +ynh_config_add_systemd yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" #================================================= # UPGRADE NPM MODULES #================================================= -ynh_script_progression --message="Installing $app..." --weight=8 +ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_use_nodejs - ynh_exec_warn_less $ynh_npm install + ynh_hide_warnings $ynh_npm install popd #================================================= @@ -64,36 +54,31 @@ popd # Replace ajax.googleapis by local file cp ../sources/jquery.min.js "$install_dir/static/jquery.min.js" -ynh_replace_string --match_string="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" --replace_string="jquery.min.js" --target_file="$install_dir/static/index.html" +ynh_replace --match="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" --replace="jquery.min.js" --file="$install_dir/static/index.html" #================================================= # UPGRADE HASTE BINARY #================================================= -ynh_script_progression --message="Updating a configuration file..." --weight=1 +ynh_script_progression "Updating configuration..." haste_url="${domain}${path}" -ynh_add_config --template="haste.sh" --destination="/usr/bin/$app" +ynh_config_add --template="haste.sh" --destination="/usr/bin/$app" -#================================================= -# GENERIC FINALIZATION #================================================= # SECURE FILES AND DIRECTORIES #================================================= -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" chmod +x /usr/bin/$app #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" +ynh_systemctl --service=$app --action=start #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed" From ff92f7be3462b880f5c13b1d7cdd7e7d86435662 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 31 Aug 2024 10:29:40 +0000 Subject: [PATCH 3/5] Auto-update READMEs --- ALL_README.md | 1 + README_ru.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 4ed64dd..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,4 +6,5 @@ - [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_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..7bb884e --- /dev/null +++ b/README_ru.md @@ -0,0 +1,50 @@ + + +# Haste для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/haste.svg)](https://ci-apps.yunohost.org/ci/apps/haste/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/haste.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/haste.maintain.svg) + +[![Установите Haste с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=haste) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить Haste быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +Haste is an open-source pastebin software written in node.js, which is easily installable in any network. YunoHost Project uses Haste as pastebin for log sharing: [paste.yunohost.org](https://paste.yunohost.org/) + + +**Поставляемая версия:** 0.1.2024.07.26~ynh1 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана Haste](./doc/screenshots/screenshot.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация пользователя: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/haste_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/haste_ynh/tree/testing --debug +или +sudo yunohost app upgrade haste -u https://github.com/YunoHost-Apps/haste_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** From c63a6f0bd8465a024b203e2cbc81a68c8f1ce056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 31 Aug 2024 15:42:23 +0200 Subject: [PATCH 4/5] cleaning --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index ef13462..99aeaec 100755 --- a/scripts/install +++ b/scripts/install @@ -53,7 +53,7 @@ ynh_replace --match="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.m ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_hide_warnings $ynh_npm install + ynh_hide_warnings npm install popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 41f3929..4cb8479 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -44,7 +44,7 @@ yunohost service add $app --description="Haste is a pastebin software" --log="/v ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_hide_warnings $ynh_npm install + ynh_hide_warnings ynh_hide_warnings ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install popd #================================================= From 91ff943585f8ca5f49d226f2da632f5891ef1428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 31 Aug 2024 21:50:40 +0200 Subject: [PATCH 5/5] cleaning --- conf/systemd.service | 2 +- manifest.toml | 2 +- scripts/install | 3 +-- scripts/upgrade | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index b7b4887..7182b2b 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__ -Environment="PATH=__ENV_PATH__" +Environment="PATH=__PATH_WITH_NODEJS__" ExecStart=__NODEJS_DIR__/npm start StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/manifest.toml b/manifest.toml index 2a37511..08991c4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://hastebin.com/about.md" code = "https://github.com/toptal/haste-server" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = false diff --git a/scripts/install b/scripts/install index 99aeaec..3f0a726 100755 --- a/scripts/install +++ b/scripts/install @@ -25,7 +25,6 @@ ynh_script_progression "Configuring NGINX web server..." ynh_config_add_nginx -env_path="$PATH" ynh_config_add_systemd mkdir -p /var/log/$app @@ -53,7 +52,7 @@ ynh_replace --match="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.m ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_hide_warnings npm install + ynh_hide_warnings ynh_exec_as_app npm install popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4cb8479..bcdc274 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,6 @@ ynh_config_add_nginx ynh_config_add_logrotate -env_path="$PATH" ynh_config_add_systemd yunohost service add $app --description="Haste is a pastebin software" --log="/var/log/$app/$app.log" @@ -44,7 +43,7 @@ yunohost service add $app --description="Haste is a pastebin software" --log="/v ynh_script_progression "Installing $app..." pushd "$install_dir" - ynh_hide_warnings ynh_hide_warnings ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install + ynh_hide_warnings ynh_exec_as_app npm install popd #=================================================