From e297e0b336be63a63fbd171a82fc1ad2af88c8e0 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:17:06 +0200 Subject: [PATCH] Update manifest.toml (#171) * Update manifest.toml * Auto-update READMEs * cleaning --------- Co-authored-by: yunohost-bot --- ALL_README.md | 2 ++ README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++ README_ru.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- manifest.toml | 8 +++---- scripts/install | 17 ++++--------- scripts/restore | 2 +- scripts/upgrade | 27 ++------------------- 13 files changed, 142 insertions(+), 48 deletions(-) create mode 100644 README_id.md create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,6 @@ - [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_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index b3c106c..8ab0891 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 24.05.3~ynh1 +**Shipped version:** 24.05.4~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 0c5d951..60612cb 100644 --- a/README_es.md +++ b/README_es.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión actual:** 24.05.3~ynh1 +**Versión actual:** 24.05.4~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 9304c0c..727506d 100644 --- a/README_eu.md +++ b/README_eu.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Paketatutako bertsioa:** 24.05.3~ynh1 +**Paketatutako bertsioa:** 24.05.4~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 2a0878e..8190f68 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 24.05.3~ynh1 +**Version incluse :** 24.05.4~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 23fe605..3671ea6 100644 --- a/README_gl.md +++ b/README_gl.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión proporcionada:** 24.05.3~ynh1 +**Versión proporcionada:** 24.05.4~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..9e13ab5 --- /dev/null +++ b/README_id.md @@ -0,0 +1,61 @@ + + +# BookStack untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/bookstack.svg)](https://ci-apps.yunohost.org/ci/apps/bookstack/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/bookstack.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/bookstack.maintain.svg) + +[![Pasang BookStack dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=bookstack) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang BookStack 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 + +BookStack is an opinionated wiki system that provides a pleasant and simple out of the box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience. + +### Features + +- Multi-Factor Authentication +- Dark & Light Modes +- LDAP Authentication +- Markdown Editor +- WYSIWYG Editing +- Multi-Lingual +- Diagrams.net Integration + + +**Versi terkirim:** 24.05.4~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada BookStack](./doc/screenshots/screenshot.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi pengguna resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing --debug +atau +sudo yunohost app upgrade bookstack -u https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..a360331 --- /dev/null +++ b/README_ru.md @@ -0,0 +1,61 @@ + + +# BookStack для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/bookstack.svg)](https://ci-apps.yunohost.org/ci/apps/bookstack/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/bookstack.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/bookstack.maintain.svg) + +[![Установите BookStack с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=bookstack) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить BookStack быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +BookStack is an opinionated wiki system that provides a pleasant and simple out of the box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience. + +### Features + +- Multi-Factor Authentication +- Dark & Light Modes +- LDAP Authentication +- Markdown Editor +- WYSIWYG Editing +- Multi-Lingual +- Diagrams.net Integration + + +**Поставляемая версия:** 24.05.4~ynh1 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана BookStack](./doc/screenshots/screenshot.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация пользователя: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing --debug +или +sudo yunohost app upgrade bookstack -u https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 6183150..79cf31c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**分发版本：** 24.05.3~ynh1 +**分发版本：** 24.05.4~ynh1 **演示：** diff --git a/manifest.toml b/manifest.toml index 654f5ff..3765f6f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "24.05.3~ynh1" +version = "24.05.4~ynh1" maintainers = [] @@ -18,7 +18,7 @@ userdoc = "https://www.bookstackapp.com/docs/user/" code = "https://github.com/BookStackApp/BookStack" [integration] -yunohost = ">= 11.2.12" +yunohost = ">= 11.2.29" architectures = "all" multi_instance = true @@ -59,8 +59,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v24.05.3.tar.gz" - sha256 = "8693dd21951caa165dd3e6b9feee5278b08e90ca8cc158201de17582de9b8e5f" + url = "https://github.com/BookStackApp/BookStack/archive/refs/tags/v24.05.4.tar.gz" + sha256 = "d40fc0ce94542eb92973cf7ab1c92247375d05af3d15099e899ea82089a9c6b3" rename = "bookstack.tar.gz" autoupdate.strategy = "latest_github_release" diff --git a/scripts/install b/scripts/install index 5d56d3e..fca325a 100644 --- a/scripts/install +++ b/scripts/install @@ -17,18 +17,11 @@ timezone="$(cat /etc/timezone)" redis_db=$(ynh_redis_get_free_db) email=$(ynh_user_get_info --username=$admin --key=mail) -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - #================================================= # STORE SETTINGS FROM MANIFEST #================================================= ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db -ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -40,10 +33,10 @@ ynh_setup_source --dest_dir="$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -51,12 +44,12 @@ ynh_add_nginx_config # Create a dedicated systemd config ynh_add_systemd_config -yunohost service add $app --description="BookStack Queue Worker" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" #================================================= # INSTALL BOOKSTACK WITH COMPOSER #================================================= -ynh_script_progression --message="Installing BookStack with Composer..." --weight=5 +ynh_script_progression --message="Installing $app with Composer..." --weight=5 # Install composer ynh_install_composer @@ -76,7 +69,7 @@ chown $app:$app $install_dir/.env #================================================= # FINAL BOOKSTACK INSTALL #================================================= -ynh_script_progression --message="Install BookStack" --weight=5 +ynh_script_progression --message="Install $app" --weight=5 pushd $install_dir php$phpversion artisan key:generate --no-interaction --force diff --git a/scripts/restore b/scripts/restore index a2ea5e3..e77263d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -43,7 +43,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet -yunohost service add $app --description="BookStack Queue Worker" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index c2e49b7..d946625 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,29 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -46,7 +23,7 @@ ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env public/ ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config @@ -54,7 +31,7 @@ ynh_add_nginx_config # Create a dedicated systemd config ynh_add_systemd_config -yunohost service add $app --description="BookStack Queue Worker" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" #================================================= # INSTALL LYCHEE WITH COMPOSER