Upgrade to dnscontrol v4.0.1 and remove explicit diff2

diff --git a/Dockerfile b/Dockerfile
index 2c0cc88b904689667711d4212f5b8292da6fb08d..f73bc59fa8c44d43039edc5e8a1e1a3b92c31c38 100644 (file)
--- 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/) \
 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
     && apt install /tmp/dnscontrol.deb -y
 
 WORKDIR /dns

diff --git a/Makefile b/Makefile
index 247eec2d88c3150e570beb765798c08407494c81..af5e109acae2d580f16aea781f8bfd5ac7764cc0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,22 @@
 preview: check preview_dnscontrol
 
 preview_dnscontrol: check_dnscontrol sshfp gdns
 preview: check preview_dnscontrol
 
 preview_dnscontrol: check_dnscontrol sshfp gdns

-       dnscontrol --diff2 preview
+       dnscontrol preview

 
 check: check_dnscontrol
 
 check_dnscontrol: sshfp gdns
 
 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
 
 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
 
 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}
 
 update_geodns: gdns
        parallel --will-cite rsync --quiet --recursive --checksum gdns/ {}::geodns ::: ${GEODNS_SERVERS}