Merge 2459a7c81b into df813f3497

README.md

@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Shipped version:** 2.37.3~ynh1
+**Shipped version:** 2.37.3~ynh2
 
 **Demo:** <https://snappymail.eu/demo/>
 

README_es.md

@@ -19,7 +19,7 @@ No se debe editar a mano.
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Versión actual:** 2.37.3~ynh1
+**Versión actual:** 2.37.3~ynh2
 
 **Demo:** <https://snappymail.eu/demo/>
 

README_eu.md

@@ -19,7 +19,7 @@ EZ editatu eskuz.
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Paketatutako bertsioa:** 2.37.3~ynh1
+**Paketatutako bertsioa:** 2.37.3~ynh2
 
 **Demoa:** <https://snappymail.eu/demo/>
 

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Client de messagerie Web simple, moderne, léger et rapide. Snappymail est un fork considérablement amélioré et sécurisé de l'édition RainLoop Webmail Community.
 
-**Version incluse :** 2.37.3~ynh1
+**Version incluse :** 2.37.3~ynh2
 
 **Démo :** <https://snappymail.eu/demo/>
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Versión proporcionada:** 2.37.3~ynh1
+**Versión proporcionada:** 2.37.3~ynh2
 
 **Demo:** <https://snappymail.eu/demo/>
 

README_id.md

@@ -19,7 +19,7 @@ Ini TIDAK boleh diedit dengan tangan.
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Versi terkirim:** 2.37.3~ynh1
+**Versi terkirim:** 2.37.3~ynh2
 
 **Demo:** <https://snappymail.eu/demo/>
 

README_ru.md

@@ -19,7 +19,7 @@
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**Поставляемая версия:** 2.37.3~ynh1
+**Поставляемая версия:** 2.37.3~ynh2
 
 **Демо-версия:** <https://snappymail.eu/demo/>
 

README_zh_Hans.md

@@ -19,7 +19,7 @@
 Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
 
 
-**分发版本：** 2.37.3~ynh1
+**分发版本：** 2.37.3~ynh2
 
 **演示：** <https://snappymail.eu/demo/>
 

manifest.toml

@@ -5,7 +5,7 @@ name = "SnappyMail"
 description.en = "Simple, modern, lightweight & fast web-based e-mail client"
 description.fr = "Client de messagerie Web simple, moderne, léger et rapide"
 
-version = "2.37.3~ynh1"
+version = "2.37.3~ynh2"
 
 maintainers = []
 
@@ -17,7 +17,7 @@ admindoc = "https://github.com/the-djmaze/snappymail/wiki"
 code = "https://github.com/the-djmaze/snappymail"
 
 [integration]
-yunohost = ">= 11.2.20"
+yunohost = ">= 11.2.29"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
@@ -56,6 +56,7 @@ ram.runtime = "50M"
     [resources.system_user]
 
     [resources.install_dir]
+    group = "www-data:r-x"
 
     [resources.permissions]
     main.url = "/"

scripts/backup

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# 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
 

scripts/install

@@ -10,9 +10,6 @@ ynh_script_progression "Setting up source files..."
 
 ynh_setup_source --dest_dir="$install_dir/app"
 
-chmod -R "u=rX,g=rX,o=" "$install_dir"
-chown -R "$app:www-data" "$install_dir"
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================

scripts/restore

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# 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
 
@@ -11,9 +10,6 @@ ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
 
-chmod -R "u=rX,g=rX,o=" "$install_dir"
-chown -R "$app:www-data" "$install_dir"
-
 chmod -R "u=rwX,g=,o=" "$install_dir/app/data"
 chown -R "$app:$app" "$install_dir/app/data"
 

scripts/upgrade

@@ -22,21 +22,18 @@ fi
 #=================================================
 ynh_script_progression "Upgrading source files..."
 
-ynh_setup_source --dest_dir="$install_dir/app" --full_replace=1 --keep="data/_data_/_default_/configs/application.ini"
-
-chmod -R "u=rX,g=rX,o=" "$install_dir"
-chown -R "$app:www-data" "$install_dir"
+ynh_setup_source --dest_dir="$install_dir/app" --full_replace --keep="app/data/_data_/_default_/configs/application.ini"
 
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-ynh_script_progression "Updating configuration..."
+#ynh_script_progression "Updating configuration..."
 
-mkdir -p "$install_dir/app/data/_data_/_default_/configs"
-ynh_config_add --template="application.ini" --destination="$install_dir/app/data/_data_/_default_/configs/application.ini"
+#mkdir -p "$install_dir/app/data/_data_/_default_/configs"
+#ynh_config_add --template="application.ini" --destination="$install_dir/app/data/_data_/_default_/configs/application.ini"
 
-chmod -R "u=rwX,g=,o=" "$install_dir/app/data"
-chown -R "$app:$app" "$install_dir/app/data"
+#chmod -R "u=rwX,g=,o=" "$install_dir/app/data"
+#chown -R "$app:$app" "$install_dir/app/data"
 
 #=================================================
 # SETUP SSO
@@ -44,6 +41,7 @@ chown -R "$app:$app" "$install_dir/app/data"
 ynh_script_progression "Applying SSO patch..."
 
 ynh_config_add --template="sso.php" --destination="$install_dir/index.php"
+
 chmod "u=rX,g=,o=" "$install_dir/index.php"
 chown "$app:www-data" "$install_dir/index.php"