From 078a69f75e3717c9f97692b79bddf8e642b3b12e Mon Sep 17 00:00:00 2001
From: Brian Cunnie <brian.cunnie@gmail.com>
Date: Tue, 8 Oct 2024 18:53:08 -0700
Subject: [PATCH] 3.2.2: Join the Public Suffix List

---
 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, 10 insertions(+), 8 deletions(-)

diff --git a/bin/make_all b/bin/make_all
index 78dbdf0..cba450b 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.1 \
+ldflags="-X xip/xip.VersionSemantic=3.2.2 \
          -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 d13b472..b6f7758 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.2.0
-export VERSION=3.2.1
+export OLD_VERSION=3.2.1
+export VERSION=3.2.2
 cd ~/workspace/sslip.io
 git pull -r --autostash
 # update the version number for the TXT record for version.status.sslip.io
@@ -42,7 +42,7 @@ Test from another window:
 
 ```bash
 export DNS_SERVER_IP=127.0.0.1
-export VERSION=3.2.1
+export VERSION=3.2.2
 # quick sanity test
 dig +short 127.0.0.1.example.com @$DNS_SERVER_IP
 echo 127.0.0.1
@@ -70,8 +70,10 @@ echo "\"$VERSION\""
 echo " ===" # separator because the results are too similar
 dig @$DNS_SERVER_IP 1.0.0.127.in-addr.arpa ptr +short
 echo "127-0-0-1.sslip.io."
+dig @$DNS_SERVER_IP _psl.sslip.io txt +short
+echo "\"https://github.com/publicsuffix/list/pull/2206\""
 dig @$DNS_SERVER_IP metrics.status.sslip.io txt +short | grep '"Queries: '
-echo '"Queries: 12 (?.?/s)"'
+echo '"Queries: 13 (?.?/s)"'
 ```
 
 Review the output then close the second window. Stop the server in the
diff --git a/k8s/Dockerfile-sslip.io-dns-server b/k8s/Dockerfile-sslip.io-dns-server
index e60b400..194a5ed 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.2.1/sslip.io-dns-server-linux-$TARGETARCH \
+RUN curl -f -L https://github.com/cunnie/sslip.io/releases/download/3.2.2/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 a343ce7..31a2875 100644
--- a/k8s/document_root_sslip.io/index.html
+++ b/k8s/document_root_sslip.io/index.html
@@ -171,7 +171,7 @@ src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]-->
       our server within a docker container:</p>
       <pre>
 docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/3.2.1/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/3.2.2/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 ca4d240..ac46a15 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.1'
+sslip_version = '3.2.2'
 whois_nameservers = get_whois_nameservers(domain)
 
 describe domain do