From f0e7b4694cf98b9d28884b9a096fc4f3120dfb6e Mon Sep 17 00:00:00 2001 From: ukfhVp0zms <51839669+ukfhVp0zms@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:28:04 +0000 Subject: [PATCH 1/3] Fix broken links for scp and DAV (#2522) * Update web.html: Update broken SCP man page link * Update sync-guide.html: Remove non-existing Android CalDAV and CardDAV apps from selection --- management/templates/sync-guide.html | 8 +++----- management/templates/web.html | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/management/templates/sync-guide.html b/management/templates/sync-guide.html index cafa5f0a..90c9f6eb 100644 --- a/management/templates/sync-guide.html +++ b/management/templates/sync-guide.html @@ -26,13 +26,11 @@

If you set up your mail using Exchange/ActiveSync, your contacts and calendar may already appear on your device.

-

Otherwise, here are some apps that can synchronize your contacts and calendar to your Android phone.

+

Otherwise, the app below can synchronize your contacts and calendar to your Android phone.

- - - - + +
For... Use...
Contacts and Calendar DAVx⁵ ($5.99; free here)
Only Contacts CardDAV-Sync free (free)
Only Calendar CalDAV-Sync ($2.99)
Google Play F-Droid
DAVx⁵ (paid) DAVx⁵ (free)

Use the following settings:

diff --git a/management/templates/web.html b/management/templates/web.html index ed8c7d38..7afab6ad 100644 --- a/management/templates/web.html +++ b/management/templates/web.html @@ -12,7 +12,7 @@
  1. Ensure that any domains you are publishing a website for have no problems on the Status Checks page.
    2. -
  2. On your personal computer, install an SSH file transfer program such as FileZilla or scp.
    3. +
  3. On your personal computer, install an SSH file transfer program such as FileZilla or scp.
  4. Log in to this machine with the file transfer program. The server is {{hostname}}, the protocol is SSH or SFTP, and use the SSH login credentials that you used when you originally created this machine at your cloud host provider. This is not what you use to log in either for email or this control panel. Your SSH credentials probably involves a private key file.
    5. From 9c9a7b374d9460b44c7941278b28013392ba6ab2 Mon Sep 17 00:00:00 2001 From: SE <124804869+slowengine@users.noreply.github.com> Date: Mon, 28 Jul 2025 12:40:40 +0000 Subject: [PATCH 2/3] Fix mozilla-autoconfig.xml (#2528) Fixes the Thunderbird auto configuration due to use of a which is informational and may be ignored. --- conf/mozilla-autoconfig.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/mozilla-autoconfig.xml b/conf/mozilla-autoconfig.xml index e3def309..ef1cabf4 100644 --- a/conf/mozilla-autoconfig.xml +++ b/conf/mozilla-autoconfig.xml @@ -1,6 +1,7 @@ + PRIMARY_HOSTNAME PRIMARY_HOSTNAME PRIMARY_HOSTNAME (Mail-in-a-Box) From 2d0ca67e8581a5ac592486ae1dfe8615224aeafe Mon Sep 17 00:00:00 2001 From: matidau <65836048+matidau@users.noreply.github.com> Date: Mon, 28 Jul 2025 23:01:05 +1000 Subject: [PATCH 3/3] Update zpush.sh to version 2.7.6 (#2529) --- setup/zpush.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index 397ee4a9..d04efeef 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -22,8 +22,8 @@ apt_install \ phpenmod -v "$PHP_VER" imap # Copy Z-Push into place. -VERSION=2.7.5 -TARGETHASH=f0b0b06e255f3496173ab9d28a4f2d985184720e +VERSION=2.7.6 +TARGETHASH=a0591c8c58b2cdb3ba25cd7a9115a40a3f76a72c needs_update=0 #NODOC if [ ! -f /usr/local/lib/z-push/version ]; then needs_update=1 #NODOC