From 92089cdb213da4b21a601f52ed91e88294c06f9c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 30 Aug 2024 22:48:33 +0200 Subject: [PATCH 1/5] [autopatch] Automatic patch attempt for helpers 2.1 --- conf/extra_php-fpm.conf | 4 ---- conf/nginx.conf | 2 +- manifest.toml | 4 +++- scripts/_common.sh | 14 +------------- scripts/backup | 20 +++++--------------- scripts/change_url | 15 +++------------ scripts/install | 22 +++++++--------------- scripts/remove | 14 ++++---------- scripts/restore | 32 +++++++++++--------------------- scripts/upgrade | 22 +++++++--------------- 10 files changed, 42 insertions(+), 107 deletions(-) delete mode 100644 conf/extra_php-fpm.conf diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf deleted file mode 100644 index 700c37c..0000000 --- a/conf/extra_php-fpm.conf +++ /dev/null @@ -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 diff --git a/conf/nginx.conf b/conf/nginx.conf index dd5abf8..46aa292 100644 --- a/conf/nginx.conf +++ b/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; diff --git a/manifest.toml b/manifest.toml index ad24358..e518398 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,8 @@ code = "https://codeberg.org/ladigitale/digiwords" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.18" +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 = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index 7ba8d71..3d7f008 100644 --- 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 -#================================================= diff --git a/scripts/backup b/scripts/backup index 9e2ef0a..cd9a646 100644 --- a/scripts/backup +++ b/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)." diff --git a/scripts/change_url b/scripts/change_url index 2f93da1..39d37fc 100644 --- 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..." --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" diff --git a/scripts/install b/scripts/install index ae8982d..b01e49d 100644 --- a/scripts/install +++ b/scripts/install @@ -1,36 +1,28 @@ #!/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" - +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | 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" diff --git a/scripts/remove b/scripts/remove index ac762c0..2528648 100644 --- a/scripts/remove +++ b/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" diff --git a/scripts/restore b/scripts/restore index b53fa02..f48e049 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,46 +1,36 @@ #!/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" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$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" diff --git a/scripts/upgrade b/scripts/upgrade index 6b9913a..f635b87 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,36 +1,28 @@ #!/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" - +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | 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 - \ No newline at end of file +ynh_script_progression "Upgrade of $app completed" From be0e95f2db8705dcc4ac7c905cade04453078b65 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 1 Sep 2024 11:00:47 +0000 Subject: [PATCH 2/5] Auto-update READMEs --- 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 | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_ru.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 9 files changed, 98 insertions(+), 6 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 b5cdbd7..5bdd598 100644 --- a/README.md +++ b/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) diff --git a/README_es.md b/README_es.md index ed5d21c..5e2164c 100644 --- a/README_es.md +++ b/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) diff --git a/README_eu.md b/README_eu.md index 0f78352..294c54b 100644 --- a/README_eu.md +++ b/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) diff --git a/README_fr.md b/README_fr.md index b4dd141..e179b1e 100644 --- a/README_fr.md +++ b/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) diff --git a/README_gl.md b/README_gl.md index 33fcd37..38722c6 100644 --- a/README_gl.md +++ b/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) diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..f580e6d --- /dev/null +++ b/README_id.md @@ -0,0 +1,45 @@ + + +# 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~ynh1 + +**Demo:** +## 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/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:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..e38940b --- /dev/null +++ b/README_ru.md @@ -0,0 +1,45 @@ + + +# 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~ynh1 + +**Демо-версия:** +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация пользователя: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `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 +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 7bfbb33..b97df6c 100644 --- a/README_zh_Hans.md +++ b/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) From 4547aa46e0e3e0f5b9a2853f546fbe82d1512803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 1 Sep 2024 13:37:27 +0200 Subject: [PATCH 3/5] cleaning --- manifest.toml | 2 +- scripts/install | 2 -- scripts/restore | 2 -- scripts/upgrade | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index e518398..58da4a4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://codeberg.org/ladigitale/digiwords" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index b01e49d..2ac5794 100644 --- a/scripts/install +++ b/scripts/install @@ -10,8 +10,6 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index f48e049..75f5919 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,8 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f635b87..afdb9cb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,8 +10,6 @@ ynh_script_progression "Upgrading source files..." ynh_setup_source --dest_dir="$install_dir" --keep="inc/digiwords.db" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= From a61c7afb0b3e6bfffb13a292bf018b504e68f03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 1 Sep 2024 13:37:40 +0200 Subject: [PATCH 4/5] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 58da4a4..658f81b 100644 --- a/manifest.toml +++ b/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"] From fcbcb743838c9220774eaeb48fedf0d1c221cf0f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 1 Sep 2024 11:37:45 +0000 Subject: [PATCH 5/5] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5bdd598..64ce7f0 100644 --- a/README.md +++ b/README.md @@ -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:** ## Documentation and resources diff --git a/README_es.md b/README_es.md index 5e2164c..29533ca 100644 --- a/README_es.md +++ b/README_es.md @@ -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:** ## Documentaciones y recursos diff --git a/README_eu.md b/README_eu.md index 294c54b..28e48ed 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Create interactive wordclouds -**Paketatutako bertsioa:** 0.6.0~ynh1 +**Paketatutako bertsioa:** 0.6.0~ynh2 **Demoa:** ## Dokumentazioa eta baliabideak diff --git a/README_fr.md b/README_fr.md index e179b1e..db9f29f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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 :** ## Documentations et ressources diff --git a/README_gl.md b/README_gl.md index 38722c6..4c1137d 100644 --- a/README_gl.md +++ b/README_gl.md @@ -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:** ## Documentación e recursos diff --git a/README_id.md b/README_id.md index f580e6d..1883501 100644 --- a/README_id.md +++ b/README_id.md @@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan. Create interactive wordclouds -**Versi terkirim:** 0.6.0~ynh1 +**Versi terkirim:** 0.6.0~ynh2 **Demo:** ## Dokumentasi dan sumber daya diff --git a/README_ru.md b/README_ru.md index e38940b..3e47be6 100644 --- a/README_ru.md +++ b/README_ru.md @@ -18,7 +18,7 @@ Create interactive wordclouds -**Поставляемая версия:** 0.6.0~ynh1 +**Поставляемая версия:** 0.6.0~ynh2 **Демо-версия:** ## Документация и ресурсы diff --git a/README_zh_Hans.md b/README_zh_Hans.md index b97df6c..4bc5ccb 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Create interactive wordclouds -**分发版本：** 0.6.0~ynh1 +**分发版本：** 0.6.0~ynh2 **演示：** ## 文档与资源