From 76be561b4a839f08ce6c023abfc2b47165485742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 22 Feb 2023 16:31:57 +0100 Subject: [PATCH 01/17] Update updater.sh --- .github/workflows/updater.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 1522da8..4c1f796 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -17,8 +17,8 @@ #================================================= # Fetching information -current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') -repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +current_version=$(cat manifest.toml | jq -j '.version|split("~")[0]') +repo=$(cat manifest.toml | jq -j '.upstream.code|split("https://github.com/")[1]') # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) @@ -128,7 +128,7 @@ done #================================================= # Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml # No need to update the README, yunohost-bot takes care of it From 3a19413a7e51010b78a2e24e3bd5cfecc7736db6 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 24 Feb 2023 00:35:35 +0100 Subject: [PATCH 02/17] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 4363d38..4a866ff 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From 191001fc35903297bb8f2b7b1e988a7084380a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Feb 2023 20:05:07 +0100 Subject: [PATCH 07/17] 2.26.4 --- conf/app.src | 4 ++-- manifest.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index e6666ea..d9f52df 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.26.3/snappymail-2.26.3.tar.gz -SOURCE_SUM=90d7c54275057c84bdc7a75ad279a6e1c1cad7a65349c41739aee52fa4050434 +SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.26.4/snappymail-2.26.4.tar.gz +SOURCE_SUM=0568e4773026f7f6ef3d38ec760f95afe82bd1fab312f01199ac92b61f797ec2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.toml b/manifest.toml index 1485bfd..7378ef9 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.26.3~ynh1" +version = "2.26.4~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://github.com/the-djmaze/snappymail/wiki" code = "https://github.com/the-djmaze/snappymail" [integration] -yunohost = ">= 11.1.9" +yunohost = ">= 11.1.11" architectures = "all" multi_instance = true ldap = false From f69649b792719a2e9a33ad1ab0dca5f499bf994c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 24 Feb 2023 19:05:11 +0000 Subject: [PATCH 08/17] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e3316e4..eb51855 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ 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.26.3~ynh1 +**Shipped version:** 2.26.4~ynh1 **Demo:** https://snappymail.eu/demo/ diff --git a/README_fr.md b/README_fr.md index bbf7dc0..ad8b841 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition. -**Version incluse :** 2.26.3~ynh1 +**Version incluse :** 2.26.4~ynh1 **Démo :** https://snappymail.eu/demo/ From a2ecb2501f8818f5a201c30e9fe6bda637f94946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 Mar 2023 16:53:25 +0100 Subject: [PATCH 09/17] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7378ef9..920492e 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.1.11" +yunohost = ">= 11.1.13" architectures = "all" multi_instance = true ldap = false From 74041c352808899b957b2d14d49f0157375146f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:31:09 +0100 Subject: [PATCH 10/17] remove emojis --- doc/POST_INSTALL.md | 4 ++-- doc/POST_INSTALL_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index ac5bd9e..b70ed84 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,5 +1,5 @@ -:heavy_exclamation_mark: The password-file is created after first opening the admin UI! +The password-file is created after first opening the admin UI! -:heavy_exclamation_mark: Be sure to immediately change the default password! +Be sure to immediately change the default password! Open the admin UI `https://__DOMAIN__/?admin` to configure your mail server settings. Login with user "admin" and password from the file `/var/www/snappymail/data/_data_/_default_/admin_password.txt`. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 7e4eeed..7961234 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,5 +1,5 @@ -:heavy_exclamation_mark : Le fichier de mot de passe est créé après la première ouverture de l'interface utilisateur d'administration ! +Le fichier de mot de passe est créé après la première ouverture de l'interface utilisateur d'administration ! -:heavy_exclamation_mark : Assurez-vous de changer immédiatement le mot de passe par défaut ! +Assurez-vous de changer immédiatement le mot de passe par défaut ! Ouvrez l'interface utilisateur d'administration `https://__DOMAIN__/?admin` pour configurer les paramètres de votre serveur de messagerie. Connectez-vous avec l'utilisateur "admin" et le mot de passe du fichier `/var/www/snappymail/data/_data_/_default_/admin_password.txt`. From 94f1a2e9acc650c3ac10cddeef7192b7869d5ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:35:10 +0100 Subject: [PATCH 11/17] Create DESCRIPTION_fr.md --- doc/DESCRIPTION_fr.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..b1981bf --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +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. \ No newline at end of file From 65ccb9ae3e02b4055cf0dc404bd8d9659f2551b4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 10 Mar 2023 15:35:15 +0000 Subject: [PATCH 12/17] Auto-update README --- README_fr.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index ad8b841..00e70b6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,8 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Simple, modern, lightweight & fast web-based email client. The drastically upgraded & secured fork of RainLoop Webmail Community edition. - +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.26.4~ynh1 From 475b47d32e018790bfd7cc7d82d636d41a64d26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:37:53 +0100 Subject: [PATCH 13/17] Update manifest.toml --- manifest.toml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 920492e..b161134 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.1.13" +yunohost = ">= 11.1.14" architectures = "all" multi_instance = true ldap = false @@ -39,6 +39,14 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://github.com/the-djmaze/snappymail/releases/download/v2.26.4/snappymail-2.26.4.tar.gz" + sha256 = "0568e4773026f7f6ef3d38ec760f95afe82bd1fab312f01199ac92b61f797ec2" + in_subdir = false + [resources.system_user] [resources.install_dir] From 834ac45e9620f2747086e23cfd8b6e2da38a9678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:38:10 +0100 Subject: [PATCH 14/17] Delete app.src --- conf/app.src | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 conf/app.src diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index d9f52df..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/the-djmaze/snappymail/releases/download/v2.26.4/snappymail-2.26.4.tar.gz -SOURCE_SUM=0568e4773026f7f6ef3d38ec760f95afe82bd1fab312f01199ac92b61f797ec2 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=false -SOURCE_FILENAME= From 33dfb716481a7e180dc23a06052a0b82eb3bdf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:42:29 +0100 Subject: [PATCH 15/17] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 18f8002..d033bed 100755 --- a/scripts/install +++ b/scripts/install @@ -40,7 +40,7 @@ chown -R $app:www-data "$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app ..." --weight=3 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=3 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint From 181634784d09f713f3020faa8d84301c42462d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:43:23 +0100 Subject: [PATCH 16/17] Update _common.sh --- scripts/_common.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b7c971c..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.0" - #================================================= # PERSONAL HELPERS #================================================= From 8aed8d4eb28955e01be0df54e719384bcba353a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 10 Mar 2023 16:44:05 +0100 Subject: [PATCH 17/17] cleaning --- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 1 - 3 files changed, 3 deletions(-) diff --git a/scripts/install b/scripts/install index d033bed..e975d1d 100755 --- a/scripts/install +++ b/scripts/install @@ -33,7 +33,6 @@ ynh_script_progression --message="Setting up source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" diff --git a/scripts/restore b/scripts/restore index 626a854..797fa49 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index a07a7e1..2b3636a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,7 +50,6 @@ then ynh_setup_source --dest_dir="$install_dir" --keep="data/_data_/_default_/configs/application.ini" fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"