From 61eb56c68d256752d09ecf58ad25102bde89bde3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Mar 2023 09:37:10 +0100 Subject: [PATCH 1/6] Update hm3.sample.ini --- conf/hm3.sample.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/hm3.sample.ini b/conf/hm3.sample.ini index 77fc55d..d678503 100644 --- a/conf/hm3.sample.ini +++ b/conf/hm3.sample.ini @@ -62,18 +62,20 @@ auth_type=DB ; ; The hostname or IP address of the LDAP server to authenticate to -ldap_auth_server=localhost +ldap_auth_server=127.0.0.1 ; The port the LDAP server is listening on. ldap_auth_port=389 ; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to ; true to enable TLS connections. -ldap_auth_tls= +ldap_auth_tls=false ; The "base dn" of the LDAP server ldap_auth_base_dn="ou=users,dc=yunohost,dc=org" +; Search filter +ldap_auth_search_term="(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))" ; IMAP Authentication ; ------------------- From 2c00378e298a016c7229e44ed19f96abac8698ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Mar 2023 11:07:29 +0100 Subject: [PATCH 2/6] Update hm3.sample.ini --- conf/hm3.sample.ini | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/conf/hm3.sample.ini b/conf/hm3.sample.ini index d678503..826b5cc 100644 --- a/conf/hm3.sample.ini +++ b/conf/hm3.sample.ini @@ -74,8 +74,6 @@ ldap_auth_tls=false ; The "base dn" of the LDAP server ldap_auth_base_dn="ou=users,dc=yunohost,dc=org" -; Search filter -ldap_auth_search_term="(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))" ; IMAP Authentication ; ------------------- @@ -96,6 +94,9 @@ imap_auth_port=143 ; enable this. This is only for TLS enabled sockets (typically on port 993). imap_auth_tls= +; The hostname/IP address and port sieve is listening on. Example: example.org:4190 +imap_auth_sieve_conf_host= + ; POP3 Authentication ; ------------------- @@ -325,6 +326,7 @@ css_compress=false ; only one email source, this option is less likely to be a problem. ; allow_session_cache=false +; cache_class= ; Redis Support ; ------------- @@ -510,7 +512,7 @@ db_driver=mysql ; CREATE TABLE hm_user_session (hm_id varchar(250) primary key not null, data text, date timestamp); ; ; MySQL or SQLite: -; CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, date timestamp, primary key (hm_id)); +; CREATE TABLE hm_user_session (hm_id varchar(180), data longblob, date timestamp, primary key (hm_id)); ; DB Authentication @@ -583,6 +585,11 @@ modules[]=feeds ; POP3 email account support modules[]=pop3 +; JMAP +; ---- +; JSON Meta Application Protocol for emails +;modules[]=jmap + ; IMAP ; ---- ; IMAP email account support. If you want to use OAuth2 over IMAP (currently @@ -706,6 +713,11 @@ modules[]=imap_folders ; Enables configurable keyboard shortcuts for navigations and actions modules[]=keyboard_shortcuts +; Sieve Filters +; ------------------ +; Enables configurable Sieve based IMAP filters +; modules[]=sievefilters + ; Site ; ---- ; Site specific overrides. Used to control other module sets without hacking @@ -773,6 +785,10 @@ modules[]=keyboard_shortcuts ; Defaults to full structure ; default_setting_simple_msg_parts=false +; Next and Previous emails on the message view page +; Defaults to full structure +; default_setting_pagination_links=true + ; Show icons for each IMAP message part type ; Defaults to true ; default_setting_msg_part_icons=true @@ -900,3 +916,7 @@ default_setting_language='__LANGUAGE__' ; Enable keyboard shortcuts ; Defaults to false ; default_setting_enable_keyboard_shortcuts=1 + +; Enable sieve filter +; Defaults to false +; default_setting_enable_sieve_filter=true From 7290f852d2556846eae32ef54d0f319984bf72cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 3 Apr 2023 14:23:55 +0200 Subject: [PATCH 3/6] Update manifest.toml --- manifest.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 742a938..e79790b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ admindoc = "https://cypht.org/install.html" code = "https://github.com/jasonmunro/cypht" [integration] -yunohost = ">= 11.1.14" +yunohost = ">= 11.1.16" architectures = "all" multi_instance = true ldap = true @@ -55,7 +55,9 @@ ram.runtime = "50M" [resources.sources.main] url= "https://github.com/jasonmunro/cypht/archive/eb3aac3ad3042eaf43a015a325ff59d09aceb52a.zip" sha256 = "388dec7e7714444e2a0ab00b8aad42f42816e434b382e8780fcb614289283ddf" - + autoupdate.upstream = "https://github.com/jasonmunro/cypht" + autoupdate.strategy = "latest_github_commit" + [resources.system_user] [resources.install_dir] From fdfe65ee0ef091115a8dd358654ca48cf7ac9854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 3 Apr 2023 14:24:31 +0200 Subject: [PATCH 4/6] cleaning --- .github/workflows/updater.sh | 107 ---------------------------------- .github/workflows/updater.yml | 49 ---------------- conf/app.src | 7 --- 3 files changed, 163 deletions(-) delete mode 100755 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml delete mode 100644 conf/app.src diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index fb1db0d..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]') -repo=$(cat manifest.toml | tomlq -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="https://github.com/jasonmunro/cypht/archive/refs/tags/$version.tar.gz" - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -echo "REPO=$repo" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Let's download source tarball -asset_url=$assets - -echo "Handling asset at $asset_url" - -src="app" - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true -EOT -echo "... conf/$src.src updated" - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -sed -i "s/^version\s*=.*/version = \"$version~ynh1\"/" manifest.toml - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index a56d7cb..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,49 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 23a24a3..0000000 --- a/conf/app.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/jasonmunro/cypht/archive/2e9875c8ccfee750b34958587507f1a9c2ae8b67.zip -SOURCE_SUM=17638c5eae1d79763b9496f531f76b4db17524e4f0a41ab1be932d271f8a0007 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true From 5577eca276015a3b1f9a175ea98de5e7391b919d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 3 Apr 2023 14:24:53 +0200 Subject: [PATCH 5/6] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index e79790b..7115a25 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Cypht" description.en = "Lightweight Open Source webmail" description.fr = "Webmail Open Source léger" -version = "1.3.0~ynh5" +version = "1.3.0~ynh6" maintainers = ["eric_G"] @@ -57,7 +57,7 @@ ram.runtime = "50M" sha256 = "388dec7e7714444e2a0ab00b8aad42f42816e434b382e8780fcb614289283ddf" autoupdate.upstream = "https://github.com/jasonmunro/cypht" autoupdate.strategy = "latest_github_commit" - + [resources.system_user] [resources.install_dir] From bfe4b37b8bbd904219014b7eea759cb008699942 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 3 Apr 2023 12:24:58 +0000 Subject: [PATCH 6/6] 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 1065e81..53d5ae3 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ All your E-mail, from all your accounts, in one place. Cypht is not your father' Cypht is an application built entirely of plugins, or as we call them, module sets (which is obviously way cooler sounding than plugins), that are executed by the framework. Modules provide a flexible way to add new features or customize the program without hacking the code. -**Shipped version:** 1.3.0~ynh5 +**Shipped version:** 1.3.0~ynh6 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ad6a49b..ddcc20c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Cypht est un client de messagerie web. Vous pouvez accéder à vos comptes de messagerie qui supportent IMAP, POP3 ou SMTP - comme la plupart. -**Version incluse :** 1.3.0~ynh5 +**Version incluse :** 1.3.0~ynh6 ## Captures d’écran