From 6075e9e18ef618146bcfe676060cbd7868f58b58 Mon Sep 17 00:00:00 2001
From: Brian Cunnie <brian.cunnie@gmail.com>
Date: Sat, 9 Mar 2024 07:20:50 -0800
Subject: [PATCH] 3.1.0: Shorten TTL for publicly-accessible A & AAAA records

---
 bin/make_all                          |  2 +-
 docs/DEVELOPER.md                     | 10 +++++-----
 k8s/Dockerfile-sslip.io-dns-server    |  2 +-
 k8s/document_root_sslip.io/index.html |  2 +-
 spec/check-dns_spec.rb                |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/make_all b/bin/make_all
index a9ef5efb..663398bb 100755
--- a/bin/make_all
+++ b/bin/make_all
@@ -4,7 +4,7 @@
 #
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cd $DIR/../src/sslip.io-dns-server
-ldflags="-X xip/xip.VersionSemantic=3.0.0 \
+ldflags="-X xip/xip.VersionSemantic=3.1.0 \
          -X xip/xip.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \
          -X xip/xip.VersionGitHash=$(git rev-parse --short HEAD)"
 export GOOS GOARCH
diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md
index c0624769..d4cce731 100644
--- a/docs/DEVELOPER.md
+++ b/docs/DEVELOPER.md
@@ -4,8 +4,8 @@ These instructions are meant primarily for me when deploying a new release;
 they might not make sense unless you're on my workstation.
 
 ```bash
-export OLD_VERSION=2.7.0
-export VERSION=3.0.0
+export OLD_VERSION=3.0.0
+export VERSION=3.1.0
 cd ~/workspace/sslip.io
 git pull -r --autostash
 # update the version number for the TXT record for version.status.sslip.io
@@ -21,7 +21,7 @@ Optional: Update the version for the ns-aws, ns-azure install scripts
 ```bash
 pushd ~/bin
 sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \
-  ~/bin/install_ns-a*.sh
+  ~/bin/install_ns-{aws,azure,gce}.sh
 git add -p
 git ci -m"Update sslip.io DNS server $OLD_VERSION → $VERSION"
 git push
@@ -36,7 +36,7 @@ bin/sslip.io-dns-server-darwin-arm64
 Test from another window:
 ```bash
 export DNS_SERVER_IP=127.0.0.1
-export VERSION=3.0.0
+export VERSION=3.1.0
 # quick sanity test
 dig +short 127.0.0.1.example.com @$DNS_SERVER_IP
 echo 127.0.0.1
@@ -71,7 +71,7 @@ original window. Commit our changes:
 ```bash
 git add -p
 # and commit (but DON'T push)
-git ci -vm"$VERSION: enable TCP binding in addition to UDP"
+git ci -vm"$VERSION: Shorten TTL for publicly-accessible A & AAAA records"
 git tag $VERSION
 git push
 git push --tags
diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server
index dc829761..8bc420b4 100644
--- a/k8s/Dockerfile-sslip.io-dns-server
+++ b/k8s/Dockerfile-sslip.io-dns-server
@@ -26,7 +26,7 @@ LABEL org.opencontainers.image.authors="Brian Cunnie <brian.cunnie@gmail.com>"
 RUN dnf install -y bind-utils
 
 ARG TARGETARCH # amd64, arm64 (so I can run on AWS graviton2)
-RUN curl -f -L https://github.com/cunnie/sslip.io/releases/download/3.0.0/sslip.io-dns-server-linux-$TARGETARCH \
+RUN curl -f -L https://github.com/cunnie/sslip.io/releases/download/3.1.0/sslip.io-dns-server-linux-$TARGETARCH \
     -o /usr/sbin/sslip.io-dns-server; \
   chmod 755 /usr/sbin/sslip.io-dns-server
 
diff --git a/k8s/document_root_sslip.io/index.html b/k8s/document_root_sslip.io/index.html
index 4bf6b41b..1c86cbdf 100644
--- a/k8s/document_root_sslip.io/index.html
+++ b/k8s/document_root_sslip.io/index.html
@@ -157,7 +157,7 @@ <h3 id="server">But I Want My Own DNS Server!</h3>
       install & run our server within a docker container:</p>
       <pre>
 docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/3.0.0/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/3.1.0/sslip.io-dns-server-linux-amd64 -o dns-server
 chmod +x dns-server
 ./dns-server 2&gt; dns-server.log &
 dnf install -y bind-utils
diff --git a/spec/check-dns_spec.rb b/spec/check-dns_spec.rb
index 8e61ef62..1458d3e9 100644
--- a/spec/check-dns_spec.rb
+++ b/spec/check-dns_spec.rb
@@ -18,7 +18,7 @@ def get_whois_nameservers(domain)
 end
 
 domain = ENV['DOMAIN'] || 'example.com'
-sslip_version = '3.0.0'
+sslip_version = '3.1.0'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do