diff --git a/README.md b/README.md index 2f7c457..228988d 100644 --- a/README.md +++ b/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:** diff --git a/README_es.md b/README_es.md index 209ff86..dd45d38 100644 --- a/README_es.md +++ b/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:** diff --git a/README_eu.md b/README_eu.md index 941c50f..a8584ee 100644 --- a/README_eu.md +++ b/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:** diff --git a/README_fr.md b/README_fr.md index ef0345d..08e1da8 100644 --- a/README_fr.md +++ b/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 :** diff --git a/README_gl.md b/README_gl.md index 6f6dde3..b15d594 100644 --- a/README_gl.md +++ b/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:** diff --git a/README_id.md b/README_id.md index 98c4b84..a2153e0 100644 --- a/README_id.md +++ b/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:** diff --git a/README_ru.md b/README_ru.md index 92b3ca5..521339d 100644 --- a/README_ru.md +++ b/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 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 456f20f..ead1c50 100644 --- a/README_zh_Hans.md +++ b/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 **演示:** diff --git a/manifest.toml b/manifest.toml index 920019a..86293e4 100644 --- a/manifest.toml +++ b/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 = "/" diff --git a/scripts/backup b/scripts/backup index 2223bdd..6f3e3bf 100755 --- a/scripts/backup +++ b/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 diff --git a/scripts/install b/scripts/install index 51ef5a4..666bcf7 100755 --- a/scripts/install +++ b/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 #================================================= diff --git a/scripts/restore b/scripts/restore index de26cae..519dc16 100755 --- a/scripts/restore +++ b/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" diff --git a/scripts/upgrade b/scripts/upgrade index 259642e..367cb57 100644 --- a/scripts/upgrade +++ b/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"