mirror of
https://github.com/cunnie/sslip.io.git
synced 2025-10-05 07:36:54 +08:00
2.6.1: -addresses
flag enables custom addresses
This commit is contained in:
@@ -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=2.6.0 \
|
||||
ldflags="-X xip/xip.VersionSemantic=2.6.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
|
||||
|
@@ -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.5.4
|
||||
export VERSION=2.6.0
|
||||
export OLD_VERSION=2.6.0
|
||||
export VERSION=2.6.1
|
||||
cd ~/workspace/sslip.io
|
||||
git pull -r --autostash
|
||||
# update the version number for the TXT record for version.status.sslip.io
|
||||
@@ -16,15 +16,27 @@ sed -i '' "s/$OLD_VERSION/$VERSION/g" \
|
||||
sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \
|
||||
k8s/document_root_sslip.io/index.html \
|
||||
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 install scripts
|
||||
```bash
|
||||
pushd ~/bin
|
||||
sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \
|
||||
~/bin/install_ns-a*.sh
|
||||
git add -p
|
||||
git ci -m"Update sslip.io DNS server $OLD_VERSION → $VERSION"
|
||||
git push
|
||||
popd
|
||||
```
|
||||
Build & start the new executables:
|
||||
```bash
|
||||
bin/make_all
|
||||
# Start the server, assuming macOS M1. Adjust path for GOOS, GOARCH. Linux requires `sudo`
|
||||
bin/sslip.io-dns-server-darwin-arm64
|
||||
# In another window
|
||||
```
|
||||
Test from another window:
|
||||
```bash
|
||||
export DNS_SERVER_IP=127.0.0.1
|
||||
export VERSION=2.6.0
|
||||
export VERSION=2.6.1
|
||||
# quick sanity test
|
||||
dig +short 127.0.0.1.example.com @$DNS_SERVER_IP
|
||||
echo 127.0.0.1
|
||||
@@ -63,14 +75,14 @@ dig @$DNS_SERVER_IP my-key.k-v.io txt +short # returns nothing
|
||||
dig @$DNS_SERVER_IP 1.0.0.127.in-addr.arpa ptr +short
|
||||
echo "127-0-0-1.sslip.io."
|
||||
dig @$DNS_SERVER_IP metrics.status.sslip.io txt +short | grep '"Queries: '
|
||||
echo '"Queries: 17"'
|
||||
# close the second window
|
||||
exit
|
||||
# stop the DNS server; we don't need it anymore
|
||||
# let's add our changes
|
||||
echo '"Queries: 17 (?.?/s)"'
|
||||
```
|
||||
Review the output then close the second window. Stop the server in the
|
||||
original window. Commit our changes:
|
||||
```bash
|
||||
git add -p
|
||||
# and commit (but DON'T push)
|
||||
git ci -vm"Version $VERSION: .acme_challenge.k-v.io isn't settable"
|
||||
git ci -vm"$VERSION: \`-addresses\` flag enables custom addresses"
|
||||
git tag $VERSION
|
||||
git push
|
||||
git push --tags
|
||||
|
@@ -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 https://github.com/cunnie/sslip.io/releases/download/2.6.0/sslip.io-dns-server-linux-$TARGETARCH \
|
||||
RUN curl https://github.com/cunnie/sslip.io/releases/download/2.6.1/sslip.io-dns-server-linux-$TARGETARCH \
|
||||
-o /usr/sbin/sslip.io-dns-server; \
|
||||
chmod 755 /usr/sbin/sslip.io-dns-server
|
||||
|
||||
|
@@ -157,7 +157,7 @@ src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]-->
|
||||
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/2.6.0/sslip.io-dns-server-linux-amd64 -o dns-server
|
||||
curl -L https://github.com/cunnie/sslip.io/releases/download/2.6.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
|
||||
|
@@ -18,7 +18,7 @@ def get_whois_nameservers(domain)
|
||||
end
|
||||
|
||||
domain = ENV['DOMAIN'] || 'example.com'
|
||||
sslip_version = '2.6.0'
|
||||
sslip_version = '2.6.1'
|
||||
whois_nameservers = get_whois_nameservers(domain)
|
||||
|
||||
describe domain do
|
||||
|
Reference in New Issue
Block a user