From 7a5d729a537221e043d5d24779ccb2a5f1b8cd05 Mon Sep 17 00:00:00 2001
From: Josh Brown <josh@brownj.org>
Date: Sun, 3 Jan 2021 16:54:31 -0600
Subject: [PATCH 1/3] Fix misspelling (#1893)

Change Blackblaze to Backblaze. Include B2 as the integration name.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb146e80..579ab9f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@ In Development
 
 * Incoming emails with SPF/DKIM/DMARC failures now have a higher spam score, and these messages are more likely to appear in the junk folder, since they are often spam/phishing.
 * A new Download button in the control panel's External DNS page can be used to download the required DNS records in zonefile format.
-* Blackblaze is now a supported backup protocol.
+* Backblaze B2 is now a supported backup protocol.
 * Fixed the problem when the control panel would report DNS entries as Not Set by increasing a bind query limit.
 * Fixed a control panel startup bug on some systems.
 * Fixed the MTA-STS policy file's line endings.

From 8025c41ee40707b2ce954a762b9d076bf48cc012 Mon Sep 17 00:00:00 2001
From: Nicolas North <nz@os.vu>
Date: Sun, 3 Jan 2021 23:57:54 +0100
Subject: [PATCH 2/3] Bump TTL for NS records to 1800 (30 min) to 86400 (1 day)
 as some registries require this (#1892)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nicolas North [norðurljósahviða] <nz@tillverka.xyz>
---
 management/dns_update.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/management/dns_update.py b/management/dns_update.py
index ccca69cd..781fb1dc 100755
--- a/management/dns_update.py
+++ b/management/dns_update.py
@@ -470,14 +470,14 @@ def write_nsd_zone(domain, zonefile, records, env, force):
 
 	zone = """
 $ORIGIN {domain}.
-$TTL 1800           ; default time to live
+$TTL 86400          ; default time to live
 
 @ IN SOA ns1.{primary_domain}. hostmaster.{primary_domain}. (
            __SERIAL__     ; serial number
            7200     ; Refresh (secondary nameserver update interval)
-           1800     ; Retry (when refresh fails, how often to try again)
+           86400    ; Retry (when refresh fails, how often to try again)
            1209600  ; Expire (when refresh fails, how long secondary nameserver will keep records around anyway)
-           1800     ; Negative TTL (how long negative responses are cached)
+           86400    ; Negative TTL (how long negative responses are cached)
            )
 """
 

From 879467d358d375c83225e57056569f305a1d969d Mon Sep 17 00:00:00 2001
From: Josh Brown <josh@brownj.org>
Date: Tue, 5 Jan 2021 20:12:01 -0600
Subject: [PATCH 3/3] Fix typo in users.html (#1895)

lettters -> letters
fixes #1888
---
 management/templates/users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/management/templates/users.html b/management/templates/users.html
index 78fef61a..4b349875 100644
--- a/management/templates/users.html
+++ b/management/templates/users.html
@@ -31,7 +31,7 @@
   <button type="submit" class="btn btn-primary">Add User</button>
 </form>
 <ul style="margin-top: 1em; padding-left: 1.5em; font-size: 90%;">
-  <li>Passwords must be at least eight characters consisting of English lettters and numbers only. For best results, <a href="#" onclick="return generate_random_password()">generate a random password</a>.</li>
+  <li>Passwords must be at least eight characters consisting of English letters and numbers only. For best results, <a href="#" onclick="return generate_random_password()">generate a random password</a>.</li>
   <li>Use <a href="#" onclick="return show_panel('aliases')">aliases</a> to create email addresses that forward to existing accounts.</li>
   <li>Administrators get access to this control panel.</li>
   <li>User accounts cannot contain any international (non-ASCII) characters, but <a href="#" onclick="return show_panel('aliases');">aliases</a> can.</li>