Merge pull request #167 from YunoHost-Apps/testing

Testing

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)

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:** <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.36.3~ynh3
+**Versión actual:** 2.36.3~ynh4
 
 **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.36.3~ynh3
+**Paketatutako bertsioa:** 2.36.3~ynh4
 
 **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.36.3~ynh3
+**Version incluse :** 2.36.3~ynh4
 
 **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.36.3~ynh3
+**Versión proporcionada:** 2.36.3~ynh4
 
 **Demo:** <https://snappymail.eu/demo/>
 

README_id.md

@@ -0,0 +1,50 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# 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~ynh4
+
+**Demo:** <https://snappymail.eu/demo/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada SnappyMail](./doc/screenshots/screenshot.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://snappymail.eu/>
+- Dokumentasi admin resmi: <https://github.com/the-djmaze/snappymail/wiki>
+- Depot kode aplikasi hulu: <https://github.com/the-djmaze/snappymail>
+- Gudang YunoHost: <https://apps.yunohost.org/app/snappymail>
+- Laporkan bug: <https://github.com/YunoHost-Apps/snappymail_ynh/issues>
+
+## 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:** <https://yunohost.org/packaging_apps>

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
 
 **演示：** <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.36.3~ynh3"
+version = "2.36.3~ynh4"
 
 maintainers = []
 
@@ -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"

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 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 -R $app:$app "$install_dir/app/data"
-chown $app:$app "$install_dir/app/data/_data_/_default_/configs/application.ini"
+chmod -R 600 "$install_dir/app/data"
 
 #=================================================
 # SETUP SSO
@@ -45,6 +43,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

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

scripts/upgrade

@@ -16,7 +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:root $install_dir/app/
 fi
 
 #=================================================
@@ -24,9 +23,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 +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"
+chmod -R 600 "$install_dir/app/data"
-#chown $app:$app "$install_dir/app/data/_data_/_default_/configs/application.ini"
+chown -R $app:$app "$install_dir/app/data"
 
 #=================================================
 # SETUP SSO
@@ -58,6 +57,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