Merge 9483f1a05d into baf24b5e57

2024-09-03 20:36:12 +02:00 · 2024-09-02 08:56:52 +02:00 · 2024-09-02 08:56:52 +02:00 · cf94de02fc
commit cf94de02fc
parent baf24b5e57 9483f1a05d
20 changed files with 163 additions and 152 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
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Yellow for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Working status](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Working status](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)

 [![Install Yellow with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](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:** <https://datenstrom.se/yellow/demo/>

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

 # Yellow para Yunohost

-[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)

 [![Instalar Yellow con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](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:** <https://datenstrom.se/yellow/demo/>

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

 # Yellow YunoHost-erako

-[![Integrazio maila](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)

 [![Instalatu Yellow YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](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:** <https://datenstrom.se/yellow/demo/>

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

 # Yellow pour YunoHost

-[![Niveau d’intégration](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)

 [![Installer Yellow avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](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 :** <https://datenstrom.se/yellow/demo/>

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

 # Yellow para YunoHost

-[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)

 [![Instalar Yellow con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](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:** <https://datenstrom.se/yellow/demo/>

--- a/README_id.md
+++ b/README_id.md
@ -0,0 +1,49 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Yellow untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+
+[![Pasang Yellow dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](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:** <https://datenstrom.se/yellow/demo/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Yellow](./doc/screenshots/datenstrom-yellow-en.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://datenstrom.se/yellow/>
+- Dokumentasi admin resmi: <https://datenstrom.se/yellow/help/>
+- Depot kode aplikasi hulu: <https://github.com/datenstrom/yellow/>
+- Gudang YunoHost: <https://apps.yunohost.org/app/yellow>
+- Laporkan bug: <https://github.com/YunoHost-Apps/yellow_ynh/issues>
+
+## 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:** <https://yunohost.org/packaging_apps>
--- a/README_ru.md
+++ b/README_ru.md
@ -0,0 +1,49 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Yellow для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+
+[![Установите Yellow с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](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
+
+**Демо-версия:** <https://datenstrom.se/yellow/demo/>
+
+## Снимки экрана
+
+![Снимок экрана Yellow](./doc/screenshots/datenstrom-yellow-en.png)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://datenstrom.se/yellow/>
+- Официальная документация администратора: <https://datenstrom.se/yellow/help/>
+- Репозиторий кода главной ветки приложения: <https://github.com/datenstrom/yellow/>
+- Магазин YunoHost: <https://apps.yunohost.org/app/yellow>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/yellow_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `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
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -5,7 +5,7 @@

 # YunoHost 上的 Yellow

-[![集成程度](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![工作状态](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/yellow.svg)](https://ci-apps.yunohost.org/ci/apps/yellow/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg)

 [![使用 YunoHost 安装 Yellow](https://install-app.yunohost.org/install-with-yunohost.svg)](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

 **演示：** <https://datenstrom.se/yellow/demo/>

--- 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
@ -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;
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@ -1 +1 @@
-Yellow is for people who make small websites
+Yellow is for people who make small websites.
--- 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"
--- 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
 #=================================================
--- 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)."
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"