From 6d0d069b2ba7e22efdf351202984b1208cb1fdb7 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 3 Aug 2024 22:59:02 +0200 Subject: [PATCH 1/6] Fix file permissions. --- scripts/install | 4 +++- scripts/restore | 4 +++- scripts/upgrade | 14 +++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index efe3320..ec82bad 100755 --- a/scripts/install +++ b/scripts/install @@ -10,7 +10,7 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir/app" -chmod -R o-rwx "$install_dir" +chmod -R 755 "$install_dir" chown -R $app:www-data "$install_dir" #================================================= @@ -45,6 +45,8 @@ chown $app:$app "$install_dir/app/data/_data_/_default_/configs/application.ini" ynh_script_progression "Applying SSO patch..." ynh_config_add --template="sso.php" --destination="$install_dir/index.php" +chown $app:www-data "$install_dir/index.php" +chmod 750 "$install_dir/index.php" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 8602989..a74297c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -11,8 +11,10 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -chmod -R o-rwx "$install_dir" +chmod -R 750 "$install_dir" chown -R $app:www-data "$install_dir" +chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" +chown -R $app:$app "$install_dir/app/data/_data_" #================================================= # RESTORE SYSTEM CONFIGURATIONS diff --git a/scripts/upgrade b/scripts/upgrade index b5e4805..ff15b2a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,7 +16,9 @@ then mkdir -p $install_dir/app # Ugly way to not return an error when moving everything to a subfolter of the same folder https://stackoverflow.com/a/43262922 find $install_dir -maxdepth 1 -mindepth 1 -not -name app -exec mv -t $install_dir/app {} + - chown $app:root $install_dir/app/ + chown $app:www-data $install_dir/app/ + chown $app:$app -R "$install_dir/app/data/_data_" + chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" fi #================================================= @@ -24,9 +26,9 @@ fi #================================================= ynh_script_progression "Upgrading source files..." -ynh_setup_source --dest_dir="$install_dir/app" --keep="data/_data_/_default_/configs/application.ini" +ynh_setup_source --dest_dir="$install_dir/app" --full_replace=1 --keep="data/_data_/_default_/configs/application.ini" -chmod -R o-rwx "$install_dir" +chmod -R 750 "$install_dir" chown -R $app:www-data "$install_dir" #================================================= @@ -49,8 +51,8 @@ ynh_config_add_logrotate #ynh_config_add --template="application.ini" --destination="$install_dir/app/data/_data_/_default_/configs/application.ini" -#chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" -#chown $app:$app "$install_dir/app/data/_data_/_default_/configs/application.ini" +chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" +chown -R $app:$app "$install_dir/app/data/_data_" #================================================= # SETUP SSO @@ -58,6 +60,8 @@ ynh_config_add_logrotate ynh_script_progression "Applying SSO patch..." ynh_config_add --template="sso.php" --destination="$install_dir/index.php" +chown $app:www-data "$install_dir/index.php" +chmod 750 "$install_dir/index.php" #================================================= # END OF SCRIPT From c7c3509dc8be645ed584b787dd78ab9d027679f8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 3 Aug 2024 20:58:34 +0000 Subject: [PATCH 2/6] Auto-update READMEs --- ALL_README.md | 1 + README_id.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [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_zh_Hans.md) diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..547d677 --- /dev/null +++ b/README_id.md @@ -0,0 +1,50 @@ + + +# SnappyMail untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/snappymail.svg)](https://ci-apps.yunohost.org/ci/apps/snappymail/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/snappymail.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/snappymail.maintain.svg) + +[![Pasang SnappyMail dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=snappymail) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang SnappyMail 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 + +Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition. + + +**Versi terkirim:** 2.36.3~ynh3 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada SnappyMail](./doc/screenshots/screenshot.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug +atau +sudo yunohost app upgrade snappymail -u https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** From 39f91f807d97999f314ec103ce0c52b16fc29045 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 3 Aug 2024 23:40:28 +0200 Subject: [PATCH 3/6] Fixup install permissions --- scripts/install | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index ec82bad..549351d 100755 --- a/scripts/install +++ b/scripts/install @@ -10,7 +10,7 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir/app" -chmod -R 755 "$install_dir" +chmod -R 750 "$install_dir" chown -R $app:www-data "$install_dir" #================================================= @@ -32,12 +32,10 @@ ynh_config_add_logrotate ynh_script_progression "Adding $app's configuration..." mkdir -p "$install_dir/app/data/_data_/_default_/configs" -chown $app:$app -R "$install_dir/app/data/_data_" - ynh_config_add --template="application.ini" --destination="$install_dir/app/data/_data_/_default_/configs/application.ini" -chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" -chown $app:$app "$install_dir/app/data/_data_/_default_/configs/application.ini" +chown -R $app:$app "$install_dir/app/data" +chmod -R 600 "$install_dir/app/data" #================================================= # SETUP SSO From ecb110e9ef84a900b0a1758f453bf9d3d161e47b Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 3 Aug 2024 23:57:36 +0200 Subject: [PATCH 4/6] Fix upgrade. --- manifest.toml | 17 ++++++++++++++++- scripts/upgrade | 7 ++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8ad82f3..63780d0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,7 +61,22 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.3-uuid, php8.3-imagick, php8.3-sqlite3, php8.3-tidy, php8.3-dom, php8.3-intl, php8.3-mysql, php8.3-curl, php8.3-gd, php8.3-cli, php8.3-xml, php8.3-mbstring, php8.3-ldap" + packages = [ + "mariadb-server", + "php8.3-uuid", + "php8.3-imagick", + "php8.3-sqlite3", + "php8.3-tidy", + "php8.3-dom", + "php8.3-intl", + "php8.3-mysql", + "php8.3-curl", + "php8.3-gd", + "php8.3-cli", + "php8.3-xml", + "php8.3-mbstring", + "php8.3-ldap", + ] [resources.database] type = "mysql" diff --git a/scripts/upgrade b/scripts/upgrade index ff15b2a..11da544 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,9 +16,6 @@ then mkdir -p $install_dir/app # Ugly way to not return an error when moving everything to a subfolter of the same folder https://stackoverflow.com/a/43262922 find $install_dir -maxdepth 1 -mindepth 1 -not -name app -exec mv -t $install_dir/app {} + - chown $app:www-data $install_dir/app/ - chown $app:$app -R "$install_dir/app/data/_data_" - chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" fi #================================================= @@ -51,8 +48,8 @@ ynh_config_add_logrotate #ynh_config_add --template="application.ini" --destination="$install_dir/app/data/_data_/_default_/configs/application.ini" -chmod 600 "$install_dir/app/data/_data_/_default_/configs/application.ini" -chown -R $app:$app "$install_dir/app/data/_data_" +chmod -R 600 "$install_dir/app/data" +chown -R $app:$app "$install_dir/app/data" #================================================= # SETUP SSO From ff8bc11313f9c4fb8b27e70a98d6c1b7a2957981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 4 Aug 2024 08:50:12 +0200 Subject: [PATCH 5/6] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 63780d0..301c3a4 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.36.3~ynh3" +version = "2.36.3~ynh4" maintainers = [] From db13156aa9e23ba83b78fba5b9928a4dfacb991a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 4 Aug 2024 06:50:16 +0000 Subject: [PATCH 6/6] 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_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index af2fa14..7c6ee90 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.36.3~ynh3 +**Shipped version:** 2.36.3~ynh4 **Demo:** diff --git a/README_es.md b/README_es.md index 67f0e3f..b0beda7 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.36.3~ynh3 +**Versión actual:** 2.36.3~ynh4 **Demo:** diff --git a/README_eu.md b/README_eu.md index 796ca70..a4dedf0 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.36.3~ynh3 +**Paketatutako bertsioa:** 2.36.3~ynh4 **Demoa:** diff --git a/README_fr.md b/README_fr.md index d76e345..1f9890b 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.36.3~ynh3 +**Version incluse :** 2.36.3~ynh4 **Démo :** diff --git a/README_gl.md b/README_gl.md index e27f02c..ce136b3 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.36.3~ynh3 +**Versión proporcionada:** 2.36.3~ynh4 **Demo:** diff --git a/README_id.md b/README_id.md index 547d677..423043d 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.36.3~ynh3 +**Versi terkirim:** 2.36.3~ynh4 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a59029c..6ed5ff9 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.36.3~ynh3 +**分发版本：** 2.36.3~ynh4 **演示：**