diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
index cfc839e..1522da8 100755
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@@ -105,7 +105,7 @@ SOURCE_URL=$asset_url
SOURCE_SUM=$checksum
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=false
SOURCE_FILENAME=
EOT
echo "... conf/$src.src updated"
diff --git a/README.md b/README.md
index f2a3ae6..51d5a04 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# SnappyMail for YunoHost
-[](https://dash.yunohost.org/appci/app/snappymail)  
+[](https://dash.yunohost.org/appci/app/snappymail)  
[](https://install-app.yunohost.org/?app=snappymail)
*[Lire ce readme en français.](./README_fr.md)*
@@ -18,10 +18,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
-**Shipped version:** 2.16.1~ynh1
+**Shipped version:** 2.16.3~ynh1
**Demo:** https://snappymail.eu/demo/
-
## Disclaimers / important information
:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
@@ -32,21 +31,22 @@ Open the admin UI `https://example.com/?admin` to configure your mail server set
## Documentation and resources
-* Official app website: https://snappymail.eu/
-* Official admin documentation: https://github.com/the-djmaze/snappymail/wiki
-* Upstream app code repository: https://github.com/the-djmaze/snappymail
-* YunoHost documentation for this app: https://yunohost.org/app_snappymail
-* Report a bug: https://github.com/YunoHost-Apps/snappymail_ynh/issues
+* Official app website:
+* Official admin documentation:
+* Upstream app code repository:
+* YunoHost documentation for this app:
+* Report a bug:
## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing).
To try the testing branch, please proceed like that.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug
or
sudo yunohost app upgrade snappymail -u https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug
```
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+**More info regarding app packaging:**
diff --git a/README_fr.md b/README_fr.md
index 492d8bb..4c13b1f 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,10 +1,14 @@
+
+
# SnappyMail pour YunoHost
-[](https://dash.yunohost.org/appci/app/snappymail)  
+[](https://dash.yunohost.org/appci/app/snappymail)  
[](https://install-app.yunohost.org/?app=snappymail)
*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer SnappyMail rapidement et simplement sur un serveur YunoHost.
Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@@ -14,10 +18,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition.
-**Version incluse :** 2.16.1~ynh1
+**Version incluse :** 2.16.3~ynh1
**Démo :** https://snappymail.eu/demo/
-
## Avertissements / informations importantes
:heavy_exclamation_mark: The password-file is created after first opening the admin UI!
@@ -28,21 +31,22 @@ Open the admin UI `https://example.com/?admin` to configure your mail server set
## Documentations et ressources
-* Site officiel de l'app : https://snappymail.eu/
-* Documentation officielle de l'admin : https://github.com/the-djmaze/snappymail/wiki
-* Dépôt de code officiel de l'app : https://github.com/the-djmaze/snappymail
-* Documentation YunoHost pour cette app : https://yunohost.org/app_snappymail
-* Signaler un bug : https://github.com/YunoHost-Apps/snappymail_ynh/issues
+* Site officiel de l'app :
+* Documentation officielle de l'admin :
+* Dépôt de code officiel de l'app :
+* Documentation YunoHost pour cette app :
+* Signaler un bug :
## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug
ou
sudo yunohost app upgrade snappymail -u https://github.com/YunoHost-Apps/snappymail_ynh/tree/testing --debug
```
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file
+**Plus d'infos sur le packaging d'applications :**
diff --git a/check_process b/check_process
index 52b9ba5..d7e68af 100644
--- a/check_process
+++ b/check_process
@@ -14,7 +14,8 @@
setup_private=1
setup_public=1
upgrade=1
- #upgrade=1 from_commit=e94c50dabce1e91564e1dd41770c846eb6784e8a
+ #2.16.1
+ upgrade=1 from_commit=3c1a929c81b91e6b5d8b8512cd24a3d1fe0e56cd
backup_restore=1
multi_instance=1
change_url=1
@@ -22,6 +23,6 @@
Email=
Notification=none
;;; Upgrade options
- ; commit=e94c50dabce1e91564e1dd41770c846eb6784e8a
- name=Merge pull request #13 from YunoHost-Apps/testing
+ ; commit=3c1a929c81b91e6b5d8b8512cd24a3d1fe0e56cd
+ name=Merge pull request #21 from YunoHost-Apps/testing
manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&
diff --git a/conf/app.src b/conf/app.src
index 5ec64bd..f9ec000 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.16.1/snappymail-2.16.1.tar.gz
-SOURCE_SUM=bf62279e2b1051b566a5a5d080a71555ae7c5e134d36d395a442f5a46e12729f
+SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.16.3/snappymail-2.16.3.tar.gz
+SOURCE_SUM=e629fafd3e536f8133f8479603e29b0af3cb2a6f249cfad3d8988046f1cdcf63
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=false
diff --git a/manifest.json b/manifest.json
index b318872..2e54bed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
"en": "Simple, modern, lightweight & fast web-based email client",
"fr": "Client de messagerie Web simple, moderne, léger et rapide"
},
- "version": "2.16.1~ynh1",
+ "version": "2.16.3~ynh1",
"url": "https://snappymail.eu/",
"upstream": {
"license": "AGPL-3.0-only",
@@ -29,7 +29,7 @@
"php8.0-fpm"
],
"arguments": {
- "install" : [
+ "install": [
{
"name": "domain",
"type": "domain"
diff --git a/scripts/upgrade b/scripts/upgrade
index a1b86b0..b085d6e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -57,13 +57,9 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=5
# Download, check integrity, uncompress and patch the source from app.src
- ynh_setup_source --dest_dir="$final_path"
- # Remove the app directory securely
- ynh_secure_remove --file="$final_path/snappymail/v/2.15.3"
+ ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data/_data_/_default_/configs/application.ini"
fi
-
-
chmod 750 "$final_path"
chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path"