Merge f520e06c02 into c80b08bae7

2024-09-03 18:25:56 +02:00 · 2024-09-01 12:41:58 +02:00 · 2024-09-01 12:41:58 +02:00 · ac379ed32e
commit ac379ed32e
parent c80b08bae7 f520e06c02
19 changed files with 146 additions and 128 deletions
--- 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)
--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ It shall NOT be edited by hand.

 Simple and useful tools for the classroom

-**Shipped version:** 0.5.0~ynh2
+**Shipped version:** 0.5.0~ynh3

 **Demo:** <https://ladigitale.dev/digitools/>

--- a/README_es.md
+++ b/README_es.md
@ -18,7 +18,7 @@ No se debe editar a mano.

 Simple and useful tools for the classroom

-**Versión actual:** 0.5.0~ynh2
+**Versión actual:** 0.5.0~ynh3

 **Demo:** <https://ladigitale.dev/digitools/>

--- a/README_eu.md
+++ b/README_eu.md
@ -18,7 +18,7 @@ EZ editatu eskuz.

 Simple and useful tools for the classroom

-**Paketatutako bertsioa:** 0.5.0~ynh2
+**Paketatutako bertsioa:** 0.5.0~ynh3

 **Demoa:** <https://ladigitale.dev/digitools/>

--- a/README_fr.md
+++ b/README_fr.md
@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.

 Simple and useful tools for the classroom

-**Version incluse :** 0.5.0~ynh2
+**Version incluse :** 0.5.0~ynh3

 **Démo :** <https://ladigitale.dev/digitools/>

--- a/README_gl.md
+++ b/README_gl.md
@ -18,7 +18,7 @@ NON debe editarse manualmente.

 Simple and useful tools for the classroom

-**Versión proporcionada:** 0.5.0~ynh2
+**Versión proporcionada:** 0.5.0~ynh3

 **Demo:** <https://ladigitale.dev/digitools/>

--- a/README_id.md
+++ b/README_id.md
@ -0,0 +1,50 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Digitools untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/digitools.svg)](https://ci-apps.yunohost.org/ci/apps/digitools/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/digitools.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/digitools.maintain.svg)
+
+[![Pasang Digitools dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digitools)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Digitools 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
+
+Simple and useful tools for the classroom
+
+**Versi terkirim:** 0.5.0~ynh3
+
+**Demo:** <https://ladigitale.dev/digitools/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Digitools](./doc/screenshots/screenshot.jpg)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://ladigitale.dev/>
+- Dokumentasi pengguna resmi: <https://ladigitale.dev/blog/digitools-des-outils-simples-et-utiles-pour-la-classe>
+- Dokumentasi admin resmi: <https://codeberg.org/ladigitale/digitools/src/branch/main/README.md>
+- Depot kode aplikasi hulu: <https://codeberg.org/ladigitale/digitools>
+- Gudang YunoHost: <https://apps.yunohost.org/app/digitools>
+- Laporkan bug: <https://github.com/YunoHost-Apps/digitools_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/digitools_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/digitools_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade digitools -u https://github.com/YunoHost-Apps/digitools_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
--- a/README_ru.md
+++ b/README_ru.md
@ -0,0 +1,50 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Digitools для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/digitools.svg)](https://ci-apps.yunohost.org/ci/apps/digitools/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/digitools.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/digitools.maintain.svg)
+
+[![Установите Digitools с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digitools)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Digitools быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Simple and useful tools for the classroom
+
+**Поставляемая версия:** 0.5.0~ynh3
+
+**Демо-версия:** <https://ladigitale.dev/digitools/>
+
+## Снимки экрана
+
+![Снимок экрана Digitools](./doc/screenshots/screenshot.jpg)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://ladigitale.dev/>
+- Официальная документация пользователя: <https://ladigitale.dev/blog/digitools-des-outils-simples-et-utiles-pour-la-classe>
+- Официальная документация администратора: <https://codeberg.org/ladigitale/digitools/src/branch/main/README.md>
+- Репозиторий кода главной ветки приложения: <https://codeberg.org/ladigitale/digitools>
+- Магазин YunoHost: <https://apps.yunohost.org/app/digitools>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/digitools_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/digitools_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/digitools_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade digitools -u https://github.com/YunoHost-Apps/digitools_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -18,7 +18,7 @@

 Simple and useful tools for the classroom

-**分发版本：** 0.5.0~ynh2
+**分发版本：** 0.5.0~ynh3

 **演示：** <https://ladigitale.dev/digitools/>

--- a/conf/extra_php-fpm.conf
+++ b/conf/extra_php-fpm.conf
@ -1,4 +0,0 @@
-; Additional php.ini defines, specific to this pool of workers.
-
-php_admin_value[upload_max_filesize] = 50M
-php_admin_value[post_max_size] = 50M
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -12,7 +12,7 @@ location __PATH__/ {
  try_files $uri $uri/ index.php;
  location ~ [^/]\.php(/|$) {
    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__APP__.sock;

    fastcgi_index index.php;
    include fastcgi_params;
--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "Digitools"
 description.en = "Simple and useful tools for the classroom"
 description.fr = "Des outils simples et utiles pour la classe"

-version = "0.5.0~ynh2"
+version = "0.5.0~ynh3"

 maintainers = ["Pierre-Amiel Giraud"]

@ -18,7 +18,8 @@ userdoc = "https://ladigitale.dev/blog/digitools-des-outils-simples-et-utiles-po
 code = "https://codeberg.org/ladigitale/digitools"

 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.29"
+helpers_version = "2.1"
 architectures = "all"
 multi_instance = true

@ -51,6 +52,7 @@ ram.runtime = "50M"
    [resources.system_user]

    [resources.install_dir]
+    group = "www-data:r-x"

    [resources.permissions]
    main.url = "/"
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -1,17 +1,5 @@
 #!/bin/bash

 #=================================================
-# COMMON VARIABLES
+# COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#================================================= 
--- a/scripts/backup
+++ b/scripts/backup
@ -1,41 +1,26 @@
 #!/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 THE NGINX CONFIGURATION
 #=================================================

-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"

-#=================================================
-# BACKUP THE PHP-FPM CONFIGURATION
-#=================================================
-
-ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf"

 #=================================================
 # 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)."
--- a/scripts/change_url
+++ b/scripts/change_url
@ -1,26 +1,17 @@
 #!/bin/bash

-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# STANDARD MODIFICATIONS
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
+ynh_script_progression "Updating NGINX web server configuration..."

-ynh_change_url_nginx_config
+ynh_config_change_url_nginx

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Change of URL completed for $app" --time --last
- 
+ynh_script_progression "Change of URL completed for $app"
--- a/scripts/install
+++ b/scripts/install
@ -1,36 +1,26 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --weight=1
+ynh_script_progression "Setting up source files..."

 ynh_setup_source --dest_dir="$install_dir"

-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=1
+ynh_script_progression "Configuring NGINX web server..."

-ynh_add_nginx_config
+ynh_config_add_nginx

-ynh_add_fpm_config
+ynh_config_add_phpfpm

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Installation of $app completed" --last
-
+ynh_script_progression "Installation of $app completed"
--- a/scripts/remove
+++ b/scripts/remove
@ -1,26 +1,19 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+ynh_script_progression "Removing NGINX web server configuration..."

-# Remove the dedicated NGINX config
-ynh_remove_nginx_config
+ynh_config_remove_nginx

-ynh_remove_fpm_config
+ynh_config_remove_phpfpm

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Removal of $app completed" --last
+ynh_script_progression "Removal of $app completed"
--- a/scripts/restore
+++ b/scripts/restore
@ -1,47 +1,34 @@
 #!/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

 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=1
+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 SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
+ynh_script_progression "Restoring system configurations related to $app..."

-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/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf"

-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1
+ynh_script_progression "Reloading NGINX web server and PHP-FPM..."

-ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_systemctl --service=php$php_version-fpm --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"
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -1,42 +1,26 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Upgrading source files..." --weight=1
+ynh_script_progression "Upgrading source files..."

-ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="inc/digiwords.db"
-
-chmod -R o-rwx "$install_dir"
-chown -R "$app:www-data" "$install_dir"
+ynh_setup_source --dest_dir="$install_dir" --full_replace --keep="inc/digiwords.db"

 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
+ynh_script_progression "Upgrading system configurations related to $app..."

-ynh_add_nginx_config
+ynh_config_add_nginx

-ynh_add_fpm_config
+ynh_config_add_phpfpm

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Upgrade of $app completed" --last
- 
+ynh_script_progression "Upgrade of $app completed"