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 8f31bd3..dd8a634 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Yellow for YunoHost
-[](https://dash.yunohost.org/appci/app/yellow)  
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
[](https://install-app.yunohost.org/?app=yellow)
@@ -16,9 +16,9 @@ It shall NOT be edited by hand.
## Overview
-Yellow is for people who make small websites
+Yellow is for people who make small websites.
-**Shipped version:** 2024.05.29~ynh1
+**Shipped version:** 2024.08.28~ynh1
**Demo:**
diff --git a/README_es.md b/README_es.md
index 4ac6b4d..8c09fa2 100644
--- a/README_es.md
+++ b/README_es.md
@@ -5,7 +5,7 @@ No se debe editar a mano.
# Yellow para Yunohost
-[](https://dash.yunohost.org/appci/app/yellow)  
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
[](https://install-app.yunohost.org/?app=yellow)
@@ -16,9 +16,9 @@ No se debe editar a mano.
## Descripción general
-Yellow is for people who make small websites
+Yellow is for people who make small websites.
-**Versión actual:** 2024.05.29~ynh1
+**Versión actual:** 2024.08.28~ynh1
**Demo:**
diff --git a/README_eu.md b/README_eu.md
index bc65702..bf19e52 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -5,7 +5,7 @@ EZ editatu eskuz.
# Yellow YunoHost-erako
-[](https://dash.yunohost.org/appci/app/yellow)  
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
[](https://install-app.yunohost.org/?app=yellow)
@@ -16,9 +16,9 @@ EZ editatu eskuz.
## Aurreikuspena
-Yellow is for people who make small websites
+Yellow is for people who make small websites.
-**Paketatutako bertsioa:** 2024.05.29~ynh1
+**Paketatutako bertsioa:** 2024.08.28~ynh1
**Demoa:**
diff --git a/README_fr.md b/README_fr.md
index 92d0f64..da38d3b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
# Yellow pour YunoHost
-[](https://dash.yunohost.org/appci/app/yellow)  
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
[](https://install-app.yunohost.org/?app=yellow)
@@ -16,9 +16,9 @@ Il NE doit PAS être modifié à la main.
## Vue d’ensemble
-Yellow is for people who make small websites
+Yellow is for people who make small websites.
-**Version incluse :** 2024.05.29~ynh1
+**Version incluse :** 2024.08.28~ynh1
**Démo :**
diff --git a/README_gl.md b/README_gl.md
index 7a1d280..c404f51 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -5,7 +5,7 @@ NON debe editarse manualmente.
# Yellow para YunoHost
-[](https://dash.yunohost.org/appci/app/yellow)  
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
[](https://install-app.yunohost.org/?app=yellow)
@@ -16,9 +16,9 @@ NON debe editarse manualmente.
## Vista xeral
-Yellow is for people who make small websites
+Yellow is for people who make small websites.
-**Versión proporcionada:** 2024.05.29~ynh1
+**Versión proporcionada:** 2024.08.28~ynh1
**Demo:**
diff --git a/README_id.md b/README_id.md
new file mode 100644
index 0000000..be4359d
--- /dev/null
+++ b/README_id.md
@@ -0,0 +1,49 @@
+
+
+# Yellow untuk YunoHost
+
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
+
+[](https://install-app.yunohost.org/?app=yellow)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Yellow 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
+
+Yellow is for people who make small websites.
+
+**Versi terkirim:** 2024.08.28~ynh1
+
+**Demo:**
+
+## Tangkapan Layar
+
+
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi 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/yellow_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_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..8513b10
--- /dev/null
+++ b/README_ru.md
@@ -0,0 +1,49 @@
+
+
+# Yellow для YunoHost
+
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
+
+[](https://install-app.yunohost.org/?app=yellow)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Yellow быстро и просто на YunoHost-сервер.*
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Yellow is for people who make small websites.
+
+**Поставляемая версия:** 2024.08.28~ynh1
+
+**Демо-версия:**
+
+## Снимки экрана
+
+
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения:
+- Официальная документация администратора:
+- Репозиторий кода главной ветки приложения:
+- Магазин YunoHost:
+- Сообщите об ошибке:
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/yellow_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:**
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 4d4c9cb..56968e7 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -5,7 +5,7 @@
# YunoHost 上的 Yellow
-[](https://dash.yunohost.org/appci/app/yellow)  
+[](https://ci-apps.yunohost.org/ci/apps/yellow/)  
[](https://install-app.yunohost.org/?app=yellow)
@@ -16,9 +16,9 @@
## 概况
-Yellow is for people who make small websites
+Yellow is for people who make small websites.
-**分发版本:** 2024.05.29~ynh1
+**分发版本:** 2024.08.28~ynh1
**演示:**
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 96bf29e..be7c6e1 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -25,7 +25,7 @@ location __PATH__/ {
try_files $uri $uri/ yellow.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 yellow.php;
include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user;
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index 8eb52e8..8390cca 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1 +1 @@
-Yellow is for people who make small websites
\ No newline at end of file
+Yellow is for people who make small websites.
\ No newline at end of file
diff --git a/manifest.toml b/manifest.toml
index 085f956..925f5b8 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -2,10 +2,10 @@ packaging_format = 2
id = "yellow"
name = "Yellow"
-description.en = "Content management system (CMS) for simple website"
-description.fr = "Système de gestion de contenu (CMS) pour un site simple"
+description.en = "Content management system for simple website"
+description.fr = "Système de gestion de contenu pour un site simple"
-version = "2024.05.29~ynh1"
+version = "2024.08.28~ynh1"
maintainers = []
@@ -17,7 +17,8 @@ admindoc = "https://datenstrom.se/yellow/help/"
code = "https://github.com/datenstrom/yellow/"
[integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.29"
+helpers_version = "2.1"
architectures = "all"
multi_instance = true
@@ -43,18 +44,18 @@ ram.runtime = "50M"
[resources]
[resources.sources.main]
- url = "https://github.com/datenstrom/yellow/archive/9cc6912ebd449a4182d77c908a6b6425c3bca111.tar.gz"
- sha256 = "1dcee8680ffd024d09e84146ece93e3e00e0877c65192d648363aa3bc004036a"
+ url = "https://github.com/datenstrom/yellow/archive/e6513df19c02ed7d8abfe1d544ee8ae2bd1e2644.tar.gz"
+ sha256 = "cd8d2c58814bb06c5d6f5650edd3ec6bbcf52bff742d50310d11de4e31f3546d"
autoupdate.upstream = "https://github.com/datenstrom/yellow"
autoupdate.strategy = "latest_github_commit"
[resources.system_user]
[resources.install_dir]
+ group = "www-data:r-x"
[resources.permissions]
main.url = "/"
[resources.apt]
- packages = "php8.2-mbstring, php8.2-xmlrpc, php8.2-sqlite3, php8.2-soap, php8.2-gd, php8.2-xml, php8.2-cli, php8.2-curl, php8.2-zip"
-
+ packages = "php8.3-mbstring, php8.3-xmlrpc, php8.3-sqlite3, php8.3-soap, php8.3-gd, php8.3-xml, php8.3-cli, php8.3-curl, php8.3-zip"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 944a65e..3d7f008 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,17 +1,5 @@
#!/bin/bash
#=================================================
-# COMMON VARIABLES
-#=================================================
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
+# COMMON VARIABLES AND CUSTOM HELPERS
#=================================================
diff --git a/scripts/backup b/scripts/backup
index 851d286..2f83233 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -1,39 +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"
#=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM 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)."
diff --git a/scripts/change_url b/scripts/change_url
index 124bf3a..39d37fc 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -1,23 +1,17 @@
#!/bin/bash
-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# 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
#=================================================
# 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 5be4c19..16a3a4c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -1,38 +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=7
+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"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
#=================================================
# SYSTEM CONFIGURATION
#=================================================
-ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
+ynh_script_progression "Adding system configurations related to $app..."
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx
-# Create a dedicated PHP-FPM config
-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 5b17c2d..ee9c6ec 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,27 +1,19 @@
#!/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 dedicated NGINX config
-ynh_remove_nginx_config
+ynh_config_remove_nginx
-# Remove the dedicated PHP-FPM config
-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 a1e8f97..2182661 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,47 +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=2
+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
#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-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/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=2
+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 7217840..21cf57a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,48 +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 "Upgrading source files..."
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
- ynh_script_progression --message="Upgrading source files..." --weight=2
-
- # Download, check integrity, uncompress and patch the source from app.src
- ynh_setup_source --dest_dir="$install_dir" --keep="content media system/extensions"
-fi
-
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+ynh_setup_source --dest_dir="$install_dir" --keep="content media system/extensions"
#=================================================
# REAPPLY SYSTEM CONFIGURATIONS
#=================================================
-ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
+ynh_script_progression "Upgrading system configurations related to $app..."
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx
-# Create a dedicated php-fpm config
-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"