diff --git a/README.md b/README.md
index 42c97bd..f19744a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams.
-**Shipped version:** 24.7.8~ynh1
+**Shipped version:** 24.7.8~ynh2
**Demo:**
diff --git a/README_es.md b/README_es.md
index 3874f5d..9a19277 100644
--- a/README_es.md
+++ b/README_es.md
@@ -19,7 +19,7 @@ No se debe editar a mano.
diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams.
-**Versión actual:** 24.7.8~ynh1
+**Versión actual:** 24.7.8~ynh2
**Demo:**
diff --git a/README_eu.md b/README_eu.md
index 4d04eb6..4238263 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -19,7 +19,7 @@ EZ editatu eskuz.
diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams.
-**Paketatutako bertsioa:** 24.7.8~ynh1
+**Paketatutako bertsioa:** 24.7.8~ynh2
**Demoa:**
diff --git a/README_fr.md b/README_fr.md
index 017eb1f..7f7a7ed 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
Application en ligne qui permet de faire des schémas et du dessin vectoriel
-**Version incluse :** 24.7.8~ynh1
+**Version incluse :** 24.7.8~ynh2
**Démo :**
diff --git a/README_gl.md b/README_gl.md
index 243d515..188ea76 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -19,7 +19,7 @@ NON debe editarse manualmente.
diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams.
-**Versión proporcionada:** 24.7.8~ynh1
+**Versión proporcionada:** 24.7.8~ynh2
**Demo:**
diff --git a/README_id.md b/README_id.md
index b70507d..29aa24f 100644
--- a/README_id.md
+++ b/README_id.md
@@ -19,7 +19,7 @@ Ini TIDAK boleh diedit dengan tangan.
diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams.
-**Versi terkirim:** 24.7.8~ynh1
+**Versi terkirim:** 24.7.8~ynh2
**Demo:**
diff --git a/README_ru.md b/README_ru.md
index d2e77de..f53895d 100644
--- a/README_ru.md
+++ b/README_ru.md
@@ -19,7 +19,7 @@
diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams.
-**Поставляемая версия:** 24.7.8~ynh1
+**Поставляемая версия:** 24.7.8~ynh2
**Демо-версия:**
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 0dfb895..abf93df 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -19,7 +19,7 @@
diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams.
-**分发版本:** 24.7.8~ynh1
+**分发版本:** 24.7.8~ynh2
**演示:**
diff --git a/manifest.toml b/manifest.toml
index 6149a1e..907fcce 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Diagrams.net"
description.en = "Diagram software for making flowcharts, process diagrams, org charts"
description.fr = "Application qui permet de faire des schémas et du dessin vectoriel"
-version = "24.7.8~ynh1"
+version = "24.7.8~ynh2"
maintainers = ["Gofannon"]
@@ -17,7 +17,8 @@ admindoc = "https://www.diagrams.net/doc"
code = "https://github.com/jgraph/drawio"
[integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.29"
+helpers_version = "2.1"
architectures = "all"
multi_instance = true
@@ -49,6 +50,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 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 52eea5b..5d6d43d 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -1,34 +1,24 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers
-#=================================================
-# DECLARE DATA AND CONF FILES TO BACKUP
-#=================================================
-ynh_print_info --message="Declaring files to be backed up..."
+ynh_print_info "Declaring files to be backed up..."
#=================================================
# BACKUP THE APP MAIN DIR
#=================================================
-ynh_backup --src_path="$install_dir"
+ynh_backup "$install_dir"
#=================================================
# BACKUP THE NGINX CONFIGURATION
#=================================================
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
#=================================================
# 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 d841b05..39d37fc 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -1,25 +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=25
+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 33a9d1c..944aaf9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -1,20 +1,13 @@
#!/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=2
+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"
# Add "offline" parameter in index.html
@@ -22,19 +15,15 @@ ynh_setup_source --dest_dir="$install_dir"
sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g"
sed -i "$sed_pattern" "$install_dir/src/main/webapp/index.html"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
#=================================================
# NGINX CONFIGURATION
#=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=15
+ynh_script_progression "Configuring NGINX web server..."
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx
#=================================================
# 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 e7f44d8..4bad77e 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,24 +1,17 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# REMOVE NGINX CONFIGURATION
#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+ynh_script_progression "Removing NGINX web server configuration..."
-# Remove the dedicated NGINX config
-ynh_remove_nginx_config
+ynh_config_remove_nginx
#=================================================
# 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 2fddd7c..d4b3f91 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,45 +1,33 @@
#!/bin/bash
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers
#=================================================
# RESTORE THE APP MAIN DIR
#=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=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"
#=================================================
# SPECIFIC RESTORATION
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
+ynh_script_progression "Restoring the NGINX web server configuration..."
-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..." --weight=2
+ynh_script_progression "Reloading NGINX web server..."
-ynh_systemd_action --service_name=nginx --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 cb51fce..3eb09cb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,40 +1,29 @@
#!/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=24
+ynh_script_progression "Upgrading source files..."
-# Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$install_dir" --full_replace=1
+ynh_setup_source --dest_dir="$install_dir" --full_replace
# Add "offline" parameter in index.html
# See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported-
sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g"
sed -i "$sed_pattern" "$install_dir/src/main/webapp/index.html"
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
-
#=================================================
# NGINX CONFIGURATION
#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=17
+ynh_script_progression "Upgrading NGINX web server configuration..."
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx
#=================================================
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Upgrade of $app completed" --last
+ynh_script_progression "Upgrade of $app completed"