From f871c5adce5060fa8f80473e8389d5656e3ee03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Aug 2024 08:54:08 +0200 Subject: [PATCH 1/8] fix path to config file --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 259642e..2f04898 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,7 @@ 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" +ynh_setup_source --dest_dir="$install_dir/app" --full_replace=1 --keep="app/data/_data_/_default_/configs/application.ini" chmod -R "u=rX,g=rX,o=" "$install_dir" chown -R "$app:www-data" "$install_dir" From 324fa3acd229ca51f672ce8d436e36e5ade37954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Aug 2024 08:54:35 +0200 Subject: [PATCH 2/8] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 920019a..7d18612 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.27" helpers_version = "2.1" architectures = "all" multi_instance = true From 23ed25da2e7800f1db15213f3e4141b522fcfa4c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 29 Aug 2024 06:54:40 +0000 Subject: [PATCH 3/8] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 **演示：** From c782f963ab53dcb0393733caec5cb2adee993db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:10:11 +0200 Subject: [PATCH 4/8] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 2f04898..d2cca9d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -44,6 +44,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" From 6aa0b4bbdf8022eaedf19fcd66b7f6221a1230bc Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 31 Aug 2024 03:01:53 +0200 Subject: [PATCH 5/8] [autopatch] Automatic patch attempt for helpers 2.1 --- manifest.toml | 3 ++- scripts/install | 5 ++--- scripts/restore | 5 ++--- scripts/upgrade | 7 +++---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/manifest.toml b/manifest.toml index 920019a..17fd5d3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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.18" 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/install b/scripts/install index 51ef5a4..3dba071 100755 --- a/scripts/install +++ b/scripts/install @@ -10,9 +10,8 @@ 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" - +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R "u=rX,g=rX,o=" "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index de26cae..838f41e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -11,9 +11,8 @@ 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" - +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R "u=rX,g=rX,o=" "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | 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..d479d2e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,11 +22,10 @@ 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="data/_data_/_default_/configs/application.ini" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R "u=rX,g=rX,o=" "$install_dir" +#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" #================================================= # UPDATE A CONFIG FILE #================================================= From b50a243f8e0972b2f005035f843885f030e4abca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:04:16 +0200 Subject: [PATCH 6/8] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7d18612..f321ac2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://github.com/the-djmaze/snappymail/wiki" code = "https://github.com/the-djmaze/snappymail" [integration] -yunohost = ">= 11.2.27" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true From 3ffffaa71993f9e6850676323120bc1b04a607f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:05:13 +0200 Subject: [PATCH 7/8] cleaning --- manifest.toml | 2 +- scripts/backup | 1 - scripts/install | 2 -- scripts/restore | 3 --- scripts/upgrade | 2 -- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 17fd5d3..0e1c17e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://github.com/the-djmaze/snappymail/wiki" code = "https://github.com/the-djmaze/snappymail" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true 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 3dba071..666bcf7 100755 --- a/scripts/install +++ b/scripts/install @@ -10,8 +10,6 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir/app" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R "u=rX,g=rX,o=" "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 838f41e..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,8 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R "u=rX,g=rX,o=" "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | 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 d479d2e..b059777 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,8 +24,6 @@ ynh_script_progression "Upgrading source files..." ynh_setup_source --dest_dir="$install_dir/app" --full_replace --keep="data/_data_/_default_/configs/application.ini" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R "u=rX,g=rX,o=" "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir" #================================================= # UPDATE A CONFIG FILE #================================================= From 2459a7c81bf1f36e23ca23a70184009e1fb4d388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:07:29 +0200 Subject: [PATCH 8/8] Update upgrade --- scripts/upgrade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8b2ba97..367cb57 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,13 +27,13 @@ ynh_setup_source --dest_dir="$install_dir/app" --full_replace --keep="app/data/_ #================================================= # 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