zishuo/nip
1
0
Fork 0
mirror of https://github.com/cunnie/sslip.io.git synced 2025-10-05 15:46:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

2.6.1: -addresses flag enables custom addresses

Browse Source
This commit is contained in:
Brian Cunnie
2022-11-10 07:19:31 -08:00
parent 2ad8ef059a
commit 262a1e0ea1
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/make_all
View File

@@ -4,7 +4,7 @@
# #
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
cd $DIR/../src/sslip.io-dns-server 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.VersionDate=$(date +%Y/%m/%d-%H:%M:%S%z) \
-X xip/xip.VersionGitHash=$(git rev-parse --short HEAD)" -X xip/xip.VersionGitHash=$(git rev-parse --short HEAD)"
export GOOS GOARCH export GOOS GOARCH

34
docs/DEVELOPER.md
View File

@@ -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. they might not make sense unless you're on my workstation.
```bash ```bash
export OLD_VERSION=2.5.4 export OLD_VERSION=2.6.0
export VERSION=2.6.0 export VERSION=2.6.1
cd ~/workspace/sslip.io cd ~/workspace/sslip.io
git pull -r --autostash git pull -r --autostash
# update the version number for the TXT record for version.status.sslip.io # 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" \ sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \
k8s/document_root_sslip.io/index.html \ k8s/document_root_sslip.io/index.html \
k8s/Dockerfile-sslip.io-dns-server 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" \ sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \
~/bin/install_ns-a*.sh ~/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 bin/make_all
# Start the server, assuming macOS M1. Adjust path for GOOS, GOARCH. Linux requires `sudo` # Start the server, assuming macOS M1. Adjust path for GOOS, GOARCH. Linux requires `sudo`
bin/sslip.io-dns-server-darwin-arm64 bin/sslip.io-dns-server-darwin-arm64
# In another window ```
Test from another window:
```bash
export DNS_SERVER_IP=127.0.0.1 export DNS_SERVER_IP=127.0.0.1
export VERSION=2.6.0 export VERSION=2.6.1
# quick sanity test # quick sanity test
dig +short 127.0.0.1.example.com @$DNS_SERVER_IP dig +short 127.0.0.1.example.com @$DNS_SERVER_IP
echo 127.0.0.1 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 dig @$DNS_SERVER_IP 1.0.0.127.in-addr.arpa ptr +short
echo "127-0-0-1.sslip.io." echo "127-0-0-1.sslip.io."
dig @$DNS_SERVER_IP metrics.status.sslip.io txt +short | grep '"Queries: ' dig @$DNS_SERVER_IP metrics.status.sslip.io txt +short | grep '"Queries: '
echo '"Queries: 17"' echo '"Queries: 17 (?.?/s)"'
# close the second window ```
exit Review the output then close the second window. Stop the server in the
# stop the DNS server; we don't need it anymore original window. Commit our changes:
# let's add our changes ```bash
git add -p git add -p
# and commit (but DON'T push) # 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 tag $VERSION
git push git push
git push --tags git push --tags

2
k8s/Dockerfile-sslip.io-dns-server
View File

@@ -26,7 +26,7 @@ LABEL org.opencontainers.image.authors="Brian Cunnie <brian.cunnie@gmail.com>"
RUN dnf install -y bind-utils RUN dnf install -y bind-utils
ARG TARGETARCH # amd64, arm64 (so I can run on AWS graviton2) 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; \ -o /usr/sbin/sslip.io-dns-server; \
chmod 755 /usr/sbin/sslip.io-dns-server chmod 755 /usr/sbin/sslip.io-dns-server

2
k8s/document_root_sslip.io/index.html
View File

@@ -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> install & run our server within a docker container:</p>
<pre> <pre>
docker run -it --rm fedora 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 chmod +x dns-server
./dns-server 2&gt; dns-server.log & ./dns-server 2&gt; dns-server.log &
dnf install -y bind-utils dnf install -y bind-utils

2
spec/check-dns_spec.rb
View File

@@ -18,7 +18,7 @@ def get_whois_nameservers(domain)
end end
domain = ENV['DOMAIN'] || 'example.com' domain = ENV['DOMAIN'] || 'example.com'
sslip_version = '2.6.0' sslip_version = '2.6.1'
whois_nameservers = get_whois_nameservers(domain) whois_nameservers = get_whois_nameservers(domain)
describe domain do describe domain do