From: Grant Slater <github@firefishy.com>
Date: Fri, 19 May 2023 21:01:24 +0000 (+0300)
Subject: Upgrade to dnscontrol v4.0.1 and remove explicit diff2
X-Git-Url: https://git.openstreetmap.org/dns.git/commitdiff_plain/c643ffa7189d0be0ffc27ba2dbff9d3a5ab35f37

Upgrade to dnscontrol v4.0.1 and remove explicit diff2
---

diff --git a/Dockerfile b/Dockerfile
index 2c0cc88..f73bc59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
-    && curl -fsSL https://github.com/StackExchange/dnscontrol/releases/download/v3.22.0/dnscontrol-3.22.0.${arch}.deb -o /tmp/dnscontrol.deb \
+    && curl -fsSL https://github.com/StackExchange/dnscontrol/releases/download/v4.0.1/dnscontrol-4.0.1.${arch}.deb -o /tmp/dnscontrol.deb \
     && apt install /tmp/dnscontrol.deb -y
 
 WORKDIR /dns
diff --git a/Makefile b/Makefile
index 247eec2..af5e109 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 preview: check preview_dnscontrol
 
 preview_dnscontrol: check_dnscontrol sshfp gdns
-	dnscontrol --diff2 preview
+	dnscontrol preview
 
 check: check_dnscontrol
 
 check_dnscontrol: sshfp gdns
-	dnscontrol --diff2 check
+	dnscontrol check
 
 update: update_dnscontrol update_geodns
 
 update_primary: update_dnscontrol_primary update_geodns
 
 update_dnscontrol: sshfp gdns
-	dnscontrol --diff2 push
+	dnscontrol push
 
 update_dnscontrol_primary: sshfp gdns
-	dnscontrol --diff2 push --domains openstreetmap.org
+	dnscontrol push --domains openstreetmap.org
 
 update_geodns: gdns
 	parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}