diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16addb83..b2339518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,24 @@
CHANGELOG
=========
+In Development
+--------------
+
+Package updates:
+
+* Nextcloud updated to 23.0.12 (and its apps also updated).
+* Roundcube updated to 1.6.1.
+
+Control panel:
+
+* Allow setting the backup location's S3 region name for non-AWS S3-compatible backup hosts.
+* Control panel pages can be opened in a new tab/window and bookmarked and browser history navigation now works.
+* Add a Copy button to put the rsync backup public key on clipboard.
+* Allow secondary DNS xfr: items added in the control panel to be hostnames too.
+* Fixed issue where sshkeygen fails when IPv6 is disabled.
+* Fixed issue opening munin reports.
+* Fixed report formatting in status emails sent to the administrator.
+
Version 61.1 (January 28, 2023)
-------------------------------
diff --git a/management/backup.py b/management/backup.py
index 1a38a929..bbad0d3e 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -212,7 +212,9 @@ def get_duplicity_target_url(config):
# the target URL must be the bucket name. The hostname is passed
# via get_duplicity_additional_args. Move the first part of the
# path (the bucket name) into the hostname URL component, and leave
- # the rest for the path.
+ # the rest for the path. (The S3 region name is also stored in the
+ # hostname part of the URL, in the username portion, which we also
+ # have to drop here).
target[1], target[2] = target[2].lstrip('/').split('/', 1)
target = urlunsplit(target)
@@ -240,10 +242,15 @@ def get_duplicity_additional_args(env):
]
elif get_target_type(config) == 's3':
# See note about hostname in get_duplicity_target_url.
+ # The region name, which is required by some non-AWS endpoints,
+ # is saved inside the username portion of the URL.
from urllib.parse import urlsplit, urlunsplit
target = urlsplit(config["target"])
- endpoint_url = urlunsplit(("https", target.netloc, '', '', ''))
- return ["--s3-endpoint-url", endpoint_url]
+ endpoint_url = urlunsplit(("https", target.hostname, '', '', ''))
+ args = ["--s3-endpoint-url", endpoint_url]
+ if target.username: # region name is stuffed here
+ args += ["--s3-region-name", target.username]
+ return args
return []
diff --git a/management/daemon.py b/management/daemon.py
index 871f46c1..95cea31d 100755
--- a/management/daemon.py
+++ b/management/daemon.py
@@ -764,7 +764,7 @@ def munin_cgi(filename):
support infrastructure like spawn-fcgi.
"""
- COMMAND = 'su - munin --preserve-environment --shell=/bin/bash -c /usr/lib/munin/cgi/munin-cgi-graph'
+ COMMAND = 'su munin --preserve-environment --shell=/bin/bash -c /usr/lib/munin/cgi/munin-cgi-graph'
# su changes user, we use the munin user here
# --preserve-environment retains the environment, which is where Popen's `env` data is
# --shell=/bin/bash ensures the shell used is bash
diff --git a/management/dns_update.py b/management/dns_update.py
index cef1f718..33a89d31 100755
--- a/management/dns_update.py
+++ b/management/dns_update.py
@@ -481,7 +481,7 @@ def build_sshfp_records():
pass
break
- keys = shell("check_output", ["ssh-keyscan", "-t", "rsa,dsa,ecdsa,ed25519", "-p", str(port), "localhost"])
+ keys = shell("check_output", ["ssh-keyscan", "-4", "-t", "rsa,dsa,ecdsa,ed25519", "-p", str(port), "localhost"])
keys = sorted(keys.split("\n"))
for key in keys:
@@ -1021,32 +1021,33 @@ def get_secondary_dns(custom_dns, mode=None):
values.append(hostname)
continue
- # This is a hostname. Before including in zone xfr lines,
- # resolve to an IP address. Otherwise just return the hostname.
- # It may not resolve to IPv6, so don't throw an exception if it
- # doesn't.
- if not hostname.startswith("xfr:"):
- if mode == "xfr":
- try:
- response = resolver.resolve(hostname+'.', "A", raise_on_no_answer=False)
- values.extend(map(str, response))
- except dns.exception.DNSException:
- pass
-
- try:
- response = resolver.resolve(hostname+'.', "AAAA", raise_on_no_answer=False)
- values.extend(map(str, response))
- except dns.exception.DNSException:
- pass
- continue
- values.append(hostname)
+ # If the entry starts with "xfr:" only include it in the zone transfer settings.
+ if hostname.startswith("xfr:"):
+ if mode != "xfr": continue
+ hostname = hostname[4:]
- # This is a zone-xfer-only IP address. Do not return if
- # we're querying for NS record hostnames. Only return if
- # we're querying for zone xfer IP addresses - return the
- # IP address.
- elif mode == "xfr":
- values.append(hostname[4:])
+ # If is a hostname, before including in zone xfr lines,
+ # resolve to an IP address.
+ # It may not resolve to IPv6, so don't throw an exception if it
+ # doesn't. Skip the entry if there is a DNS error.
+ if mode == "xfr":
+ try:
+ ipaddress.ip_interface(hostname) # test if it's an IP address or CIDR notation
+ values.append(hostname)
+ except ValueError:
+ try:
+ response = dns.resolver.resolve(hostname+'.', "A", raise_on_no_answer=False)
+ values.extend(map(str, response))
+ except dns.exception.DNSException:
+ pass
+ try:
+ response = dns.resolver.resolve(hostname+'.', "AAAA", raise_on_no_answer=False)
+ values.extend(map(str, response))
+ except dns.exception.DNSException:
+ pass
+
+ else:
+ values.append(hostname)
return values
diff --git a/management/email_administrator.py b/management/email_administrator.py
index bdbb56b0..9857e919 100755
--- a/management/email_administrator.py
+++ b/management/email_administrator.py
@@ -38,7 +38,7 @@ content = sys.stdin.read().strip()
# If there's nothing coming in, just exit.
if content == "":
- sys.exit(0)
+ sys.exit(0)
# create MIME message
msg = MIMEMultipart('alternative')
@@ -50,7 +50,7 @@ msg['From'] = "\"%s\" <%s>" % (env['PRIMARY_HOSTNAME'], admin_addr)
msg['To'] = admin_addr
msg['Subject'] = "[%s] %s" % (env['PRIMARY_HOSTNAME'], subject)
-content_html = "{}".format(html.escape(content))
+content_html = '{}'.format(html.escape(content))
msg.attach(MIMEText(content, 'plain'))
msg.attach(MIMEText(content_html, 'html'))
diff --git a/management/templates/aliases.html b/management/templates/aliases.html
index 2175458d..88257ecd 100644
--- a/management/templates/aliases.html
+++ b/management/templates/aliases.html
@@ -7,7 +7,7 @@
Add a mail alias
-Aliases are email forwarders. An alias can forward email to a mail user or to any email address.
+Aliases are email forwarders. An alias can forward email to a mail user or to any email address.
To use an alias or any address besides your own login username in outbound mail, the sending user must be included as a permitted sender for the alias.
diff --git a/management/templates/custom-dns.html b/management/templates/custom-dns.html
index c59624eb..7d3b6b37 100644
--- a/management/templates/custom-dns.html
+++ b/management/templates/custom-dns.html
@@ -77,7 +77,7 @@
Using a secondary nameserver
-If your TLD requires you to have two separate nameservers, you can either set up external DNS and ignore the DNS server on this box entirely, or use the DNS server on this box but add a secondary (aka “slave”) nameserver.
+If your TLD requires you to have two separate nameservers, you can either set up external DNS and ignore the DNS server on this box entirely, or use the DNS server on this box but add a secondary (aka “slave”) nameserver.
If you choose to use a secondary nameserver, you must find a secondary nameserver service provider. Your domain name registrar or virtual cloud provider may provide this service for you. Once you set up the secondary nameserver service, enter the hostname (not the IP address) of their secondary nameserver in the box below.