From adb0d5a0c1624541445b3ba936ad47537f00139f Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Tue, 17 Sep 2024 06:34:32 -0700 Subject: [PATCH] 3.2.1: Return NS records in random order --- bin/make_all | 2 +- docs/DEVELOPER.md | 9 +++++---- 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(+), 8 deletions(-) diff --git a/bin/make_all b/bin/make_all index 1cb0f2bb..78dbdf0c 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/.. -ldflags="-X xip/xip.VersionSemantic=3.2.0 \ +ldflags="-X xip/xip.VersionSemantic=3.2.1 \ -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 fcb60fc2..d13b472d 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=3.1.0 -export VERSION=3.2.0 +export OLD_VERSION=3.2.0 +export VERSION=3.2.1 cd ~/workspace/sslip.io git pull -r --autostash # update the version number for the TXT record for version.status.sslip.io @@ -18,7 +18,7 @@ sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \ k8s/Dockerfile-sslip.io-dns-server ``` -Optional: Update the version for the ns-aws, ns-azure install scripts +Optional: Update the version for the ns-aws, ns-azure, ns-gce, ns-ovh install scripts ```bash pushd ~/bin @@ -42,10 +42,11 @@ Test from another window: ```bash export DNS_SERVER_IP=127.0.0.1 -export VERSION=3.2.0 +export VERSION=3.2.1 # quick sanity test dig +short 127.0.0.1.example.com @$DNS_SERVER_IP echo 127.0.0.1 +# NS ordering might be rotated dig +short ns example.com @$DNS_SERVER_IP printf "ns-aws.sslip.io.\nns-azure.sslip.io.\nns-gce.sslip.io.\nns-ovh.sslip.io.\n" dig +short mx example.com @$DNS_SERVER_IP diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server index aa0f7ecd..e60b400e 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 " 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.2.0/sslip.io-dns-server-linux-$TARGETARCH \ +RUN curl -f -L https://github.com/cunnie/sslip.io/releases/download/3.2.1/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 086a92ef..a343ce75 100644 --- a/k8s/document_root_sslip.io/index.html +++ b/k8s/document_root_sslip.io/index.html @@ -171,7 +171,7 @@

But I Want My Own DNS Server!

our server within a docker container:

 docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/3.2.0/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/3.2.1/sslip.io-dns-server-linux-amd64 -o dns-server
 chmod +x dns-server
 ./dns-server 2> dns-server.log &
 dnf install -y bind-utils
diff --git a/spec/check-dns_spec.rb b/spec/check-dns_spec.rb
index 8e468a16..ca4d2408 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.2.0'
+sslip_version = '3.2.1'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do