From 30d78cd35a33bb68324e25c7e72ee3048ec46330 Mon Sep 17 00:00:00 2001 From: matidau <65836048+matidau@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:29:22 +1000 Subject: [PATCH 1/6] Update zpush.sh to version 2.7.3 (#2390) --- setup/zpush.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index e46d72f1..2b24a605 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.1 -TARGETHASH=f15c566b1ad50de24f3f08f505f0c3d8155c2d0d +VERSION=2.7.3 +TARGETHASH=9d4bec41935e9a4e07880c5ff915bcddbda4443b needs_update=0 #NODOC if [ ! -f /usr/local/lib/z-push/version ]; then needs_update=1 #NODOC From 6321ce6ef0876bef6124d13fd068268b1856517c Mon Sep 17 00:00:00 2001 From: matidau <65836048+matidau@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:29:51 +1000 Subject: [PATCH 2/6] Add php8.0-intl package to z-push setup (#2389) --- setup/zpush.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index 2b24a605..3b14c047 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -17,7 +17,7 @@ source /etc/mailinabox.conf # load global vars echo "Installing Z-Push (Exchange/ActiveSync server)..." apt_install \ - php"${PHP_VER}"-soap php"${PHP_VER}"-imap libawl-php php"$PHP_VER"-xml + php"${PHP_VER}"-soap php"${PHP_VER}"-imap libawl-php php"$PHP_VER"-xml php"${PHP_VER}"-intl phpenmod -v "$PHP_VER" imap From 8b9f0489c8cb412458376089a0b59aa30309325b Mon Sep 17 00:00:00 2001 From: John James Jacoby Date: Tue, 18 Jun 2024 07:32:11 -0500 Subject: [PATCH 3/6] Add custom.yaml support for WebSockets (#2385) Fixes #1956. --- management/web_update.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/management/web_update.py b/management/web_update.py index a0f0f799..c31fe8fc 100644 --- a/management/web_update.py +++ b/management/web_update.py @@ -166,6 +166,7 @@ def make_domain_config(domain, templates, ssl_certificates, env): pass_http_host_header = False proxy_redirect_off = False frame_options_header_sameorigin = False + web_sockets = False m = re.search("#(.*)$", url) if m: for flag in m.group(1).split(","): @@ -175,6 +176,8 @@ def make_domain_config(domain, templates, ssl_certificates, env): proxy_redirect_off = True elif flag == "frame-options-sameorigin": frame_options_header_sameorigin = True + elif flag == "web-sockets": + web_sockets = True url = re.sub("#(.*)$", "", url) nginx_conf_extra += "\tlocation %s {" % path @@ -185,6 +188,10 @@ def make_domain_config(domain, templates, ssl_certificates, env): nginx_conf_extra += "\n\t\tproxy_set_header Host $http_host;" if frame_options_header_sameorigin: nginx_conf_extra += "\n\t\tproxy_set_header X-Frame-Options SAMEORIGIN;" + if web_sockets: + nginx_conf_extra += "\n\t\tproxy_http_version 1.1;" + nginx_conf_extra += "\n\t\tproxy_set_header Upgrade $http_upgrade;" + nginx_conf_extra += "\n\t\tproxy_set_header Connection 'Upgrade';" nginx_conf_extra += "\n\t\tproxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;" nginx_conf_extra += "\n\t\tproxy_set_header X-Forwarded-Host $http_host;" nginx_conf_extra += "\n\t\tproxy_set_header X-Forwarded-Proto $scheme;" From 4dd1e75ee7100c3eb5c8937595cb019f78f52566 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 18 Jun 2024 22:35:54 +1000 Subject: [PATCH 4/6] Allow for `Union[None, List[datetime.datetime]]` values when printing user table in weekly mail logs (#2378) * Fix - Allow for `Union[None, List[datetime.datetime]]` when printing user tables for the weekly mail logs. * Add - ruff suppressions. --- management/mail_log.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/management/mail_log.py b/management/mail_log.py index e127af3b..ac07b0da 100755 --- a/management/mail_log.py +++ b/management/mail_log.py @@ -679,7 +679,7 @@ def print_user_table(users, data=None, sub_data=None, activity=None, latest=None data_accum[col] += d[row] try: - if None not in {latest, earliest}: + if None not in [latest, earliest]: # noqa PLR6201 vert_pos = len(line) e = earliest[row] l = latest[row] @@ -732,7 +732,7 @@ def print_user_table(users, data=None, sub_data=None, activity=None, latest=None else: header += l.rjust(max(5, len(l) + 1, col_widths[col])) - if None not in {latest, earliest}: + if None not in [latest, earliest]: # noqa PLR6201 header += " │ timespan " lines.insert(0, header.rstrip()) @@ -757,7 +757,7 @@ def print_user_table(users, data=None, sub_data=None, activity=None, latest=None footer += temp.format(data_accum[row]) try: - if None not in {latest, earliest}: + if None not in [latest, earliest]: # noqa PLR6201 max_l = max(latest) min_e = min(earliest) timespan = relativedelta(max_l, min_e) From de0fc796d43f2fea0655036c16b9aa0f594f340e Mon Sep 17 00:00:00 2001 From: jvolkenant Date: Tue, 18 Jun 2024 05:37:01 -0700 Subject: [PATCH 5/6] Fix chown during Nexcloud upgrades (#2377) --- setup/nextcloud.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index 1fb19ade..a6137fa1 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -131,7 +131,7 @@ InstallNextcloud() { # Make sure permissions are correct or the upgrade step won't run. # $STORAGE_ROOT/owncloud may not yet exist, so use -f to suppress # that error. - chown -f -R www-data:www-data "$STORAGE_ROOT/owncloud /usr/local/lib/owncloud" || /bin/true + chown -f -R www-data:www-data "$STORAGE_ROOT/owncloud" /usr/local/lib/owncloud || /bin/true # If this isn't a new installation, immediately run the upgrade script. # Then check for success (0=ok and 3=no upgrade needed, both are success). From f118a6c0bfc40c602118bfc923e226f31acd2117 Mon Sep 17 00:00:00 2001 From: Michael Heuberger Date: Tue, 9 Jul 2024 00:21:12 +1200 Subject: [PATCH 6/6] Apply small Nextcloud upgrade to 26.0.13 (#2401) --- setup/nextcloud.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup/nextcloud.sh b/setup/nextcloud.sh index a6137fa1..b2fd32fe 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -21,8 +21,8 @@ echo "Installing Nextcloud (contacts/calendar)..." # we automatically install intermediate versions as needed. # * The hash is the SHA1 hash of the ZIP package, which you can find by just running this script and # copying it from the error message when it doesn't match what is below. -nextcloud_ver=26.0.12 -nextcloud_hash=b55e9f51171c0a9b9ab3686cf5c8ad1a4292ca15 +nextcloud_ver=26.0.13 +nextcloud_hash=d5c10b650e5396d5045131c6d22c02a90572527c # Nextcloud apps # -------------- @@ -40,12 +40,12 @@ contacts_ver=5.5.3 contacts_hash=799550f38e46764d90fa32ca1a6535dccd8316e5 # Always ensure the versions are supported, see https://apps.nextcloud.com/apps/calendar -calendar_ver=4.6.6 -calendar_hash=e34a71669a52d997e319d64a984dcd041389eb22 +calendar_ver=4.7.6 +calendar_hash=a995bca4effeecb2cab25f3bbeac9bfe05fee766 # Always ensure the versions are supported, see https://apps.nextcloud.com/apps/user_external -user_external_ver=3.2.0 -user_external_hash=a494073dcdecbbbc79a9c77f72524ac9994d2eec +user_external_ver=3.3.0 +user_external_hash=280d24eb2a6cb56b4590af8847f925c28d8d853e # Developer advice (test plan) # ----------------------------