Merge pull request #25 from YunoHost-Apps/testing

Testing

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)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Digiwords for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![Working status](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![Working status](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
 
 [![Install Digiwords with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
 
@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Create interactive wordclouds
 
-**Shipped version:** 0.6.0~ynh1
+**Shipped version:** 0.6.0~ynh2
 
 **Demo:** <https://ladigitale.dev/digiwords/#/>
 ## Documentation and resources

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # Digiwords para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
 
 [![Instalar Digiwords con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
 
@@ -18,7 +18,7 @@ No se debe editar a mano.
 
 Create interactive wordclouds
 
-**Versión actual:** 0.6.0~ynh1
+**Versión actual:** 0.6.0~ynh2
 
 **Demo:** <https://ladigitale.dev/digiwords/#/>
 ## Documentaciones y recursos

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # Digiwords YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
 
 [![Instalatu Digiwords YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
 
@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 Create interactive wordclouds
 
-**Paketatutako bertsioa:** 0.6.0~ynh1
+**Paketatutako bertsioa:** 0.6.0~ynh2
 
 **Demoa:** <https://ladigitale.dev/digiwords/#/>
 ## Dokumentazioa eta baliabideak

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Digiwords pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
 
 [![Installer Digiwords avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
 
@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Digiwords est une application en ligne simple pour créer des nuages de mots.
 
-**Version incluse :** 0.6.0~ynh1
+**Version incluse :** 0.6.0~ynh2
 
 **Démo :** <https://ladigitale.dev/digiwords/#/>
 ## Documentations et ressources

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # Digiwords para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
 
 [![Instalar Digiwords con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
 
@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Create interactive wordclouds
 
-**Versión proporcionada:** 0.6.0~ynh1
+**Versión proporcionada:** 0.6.0~ynh2
 
 **Demo:** <https://ladigitale.dev/digiwords/#/>
 ## Documentación e recursos

README_id.md

@@ -0,0 +1,45 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Digiwords untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+
+[![Pasang Digiwords dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Digiwords 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
+
+Create interactive wordclouds
+
+**Versi terkirim:** 0.6.0~ynh2
+
+**Demo:** <https://ladigitale.dev/digiwords/#/>
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://ladigitale.dev/>
+- Dokumentasi pengguna resmi: <https://ladigitale.dev/blog/digiwords-pour-creer-des-nuages-de-mots>
+- Dokumentasi admin resmi: <https://codeberg.org/ladigitale/digiwords/src/branch/master/README.md>
+- Depot kode aplikasi hulu: <https://codeberg.org/ladigitale/digiwords>
+- Gudang YunoHost: <https://apps.yunohost.org/app/digiwords>
+- Laporkan bug: <https://github.com/YunoHost-Apps/digiwords_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade digiwords -u https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -0,0 +1,45 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Digiwords для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+
+[![Установите Digiwords с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Digiwords быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Create interactive wordclouds
+
+**Поставляемая версия:** 0.6.0~ynh2
+
+**Демо-версия:** <https://ladigitale.dev/digiwords/#/>
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://ladigitale.dev/>
+- Официальная документация пользователя: <https://ladigitale.dev/blog/digiwords-pour-creer-des-nuages-de-mots>
+- Официальная документация администратора: <https://codeberg.org/ladigitale/digiwords/src/branch/master/README.md>
+- Репозиторий кода главной ветки приложения: <https://codeberg.org/ladigitale/digiwords>
+- Магазин YunoHost: <https://apps.yunohost.org/app/digiwords>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/digiwords_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade digiwords -u https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 Digiwords
 
-[![集成程度](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![工作状态](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/digiwords.svg)](https://ci-apps.yunohost.org/ci/apps/digiwords/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg)
 
 [![使用 YunoHost 安装 Digiwords](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords)
 
@@ -18,7 +18,7 @@
 
 Create interactive wordclouds
 
-**分发版本：** 0.6.0~ynh1
+**分发版本：** 0.6.0~ynh2
 
 **演示：** <https://ladigitale.dev/digiwords/#/>
 ## 文档与资源

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

conf/nginx.conf

@@ -11,7 +11,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;

manifest.toml

@@ -5,7 +5,7 @@ name = "Digiwords"
 description.en = "Create interactive wordclouds"
 description.fr = "Créer des nuages de mots interactifs"
 
-version = "0.6.0~ynh1"
+version = "0.6.0~ynh2"
 
 maintainers = ["Pierre-Amiel Giraud"]
 
@@ -19,7 +19,8 @@ code = "https://codeberg.org/ladigitale/digiwords"
 
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.29"
+helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
 
@@ -52,6 +53,7 @@ ram.runtime = "50M"
     [resources.system_user]
 
     [resources.install_dir]
+    group = "www-data:r-x"
 
     [resources.permissions]
     main.url = "/"

scripts/_common.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
 #=================================================
-# COMMON VARIABLES
+# COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#================================================= 

scripts/backup

@@ -1,36 +1,26 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 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"
 
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf"
 
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.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)."

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..." --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" --last
- 
+ynh_script_progression "Change of URL completed for $app"

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"

scripts/remove

@@ -1,25 +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..."
 
-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"

scripts/restore

@@ -1,46 +1,34 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 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 THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1
+ynh_script_progression "Restoring the PHP-FPM configuration..."
 
-ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf"
 
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_restore "/etc/nginx/conf.d/$domain.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"

scripts/upgrade

@@ -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="Upgrading source files..." --weight=1
+ynh_script_progression "Upgrading source files..."
 
 ynh_setup_source --dest_dir="$install_dir" --keep="inc/digiwords.db"
 
-chmod -R o-rwx "$install_dir"
-chown -R "$app:www-data" "$install_dir"
-
 #=================================================
 # 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"