From 8da410c0297bf309d4ae3c9f7501dbeff143977a Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Wed, 16 Dec 2020 08:06:53 -0800 Subject: [PATCH] BOSH release: 1.2.1 TXT records The compelling reason was to to enable Protonmail for sslip.io email; they require specific TXT records. --- .../packages/sslip.io-dns-server/index.yml | 4 ++++ bosh-release/releases/sslip.io/index.yml | 2 ++ .../releases/sslip.io/sslip.io-1.2.1.yml | 23 +++++++++++++++++++ docs/DEVELOPER.md | 19 ++++++++------- k8s/document_root/index.html | 2 +- 5 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 bosh-release/releases/sslip.io/sslip.io-1.2.1.yml diff --git a/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml b/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml index 4352c20..3093e71 100644 --- a/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml +++ b/bosh-release/.final_builds/packages/sslip.io-dns-server/index.yml @@ -1,4 +1,8 @@ builds: + 618bfe3b109f886f329fd5eb7905531aab3d8560418782631006cc09e973deba: + version: 618bfe3b109f886f329fd5eb7905531aab3d8560418782631006cc09e973deba + blobstore_id: 79a8e95c-3ae3-4626-54df-a56a9a867def + sha1: sha256:5e44389f55dceb9012beee90721ff02d38c73e7922c6872129b3eae332a407e3 7fb9916da7e8257efbaef94d5a3869f964f37fac3dbb0c6f1693790f588f224c: version: 7fb9916da7e8257efbaef94d5a3869f964f37fac3dbb0c6f1693790f588f224c blobstore_id: bd5efc67-e5f1-4534-7d32-08a84503a813 diff --git a/bosh-release/releases/sslip.io/index.yml b/bosh-release/releases/sslip.io/index.yml index f1682a6..11fe97f 100644 --- a/bosh-release/releases/sslip.io/index.yml +++ b/bosh-release/releases/sslip.io/index.yml @@ -5,6 +5,8 @@ builds: version: 1.0.0 8298b178-a428-4fc9-4eff-49797db4cf42: version: 1.0.1 + 9220a9d3-680c-4684-6406-0919fdd1be04: + version: 1.2.1 9b52f699-55d8-4a49-50d5-e518c08334fb: version: 1.1.1 aee53e95-768b-426f-64a1-0d74d458a0a6: diff --git a/bosh-release/releases/sslip.io/sslip.io-1.2.1.yml b/bosh-release/releases/sslip.io/sslip.io-1.2.1.yml new file mode 100644 index 0000000..0f3d9af --- /dev/null +++ b/bosh-release/releases/sslip.io/sslip.io-1.2.1.yml @@ -0,0 +1,23 @@ +name: sslip.io +version: 1.2.1 +commit_hash: 169b057 +uncommitted_changes: true +jobs: +- name: sslip.io-dns-server + version: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9 + fingerprint: 308acb7c186a042bc2ca4c28b83c9fe7589a64c48ab6a11869c442bcaea8fdf9 + sha1: sha256:6ca6f2c11816a82ecb3cf9300ea59369977cbaa7c39eddca35628a7c6b9b5b45 + packages: + - sslip.io-dns-server +packages: +- name: golang-1-linux + version: f9b637fa0c031f977d2418949a3182e21fe2d95505595ebfe558a448501a8ad6 + fingerprint: f9b637fa0c031f977d2418949a3182e21fe2d95505595ebfe558a448501a8ad6 + sha1: sha256:a862fe14c40ee5fa36ebec6db08895846f955e10a22e4e4504081290317316f4 + dependencies: [] +- name: sslip.io-dns-server + version: 618bfe3b109f886f329fd5eb7905531aab3d8560418782631006cc09e973deba + fingerprint: 618bfe3b109f886f329fd5eb7905531aab3d8560418782631006cc09e973deba + sha1: sha256:5e44389f55dceb9012beee90721ff02d38c73e7922c6872129b3eae332a407e3 + dependencies: + - golang-1-linux diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index 90ae317..c5aed25 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -4,11 +4,12 @@ These instructions are meant primarily for me when deploying a new BOSH release; the might not make sense unless you're on my workstation. ``` -export OLD_VERSION=1.1.2 -export VERSION=1.2.0 -cd ~/workspace/sslip.io +export OLD_VERSION=1.2.0 +export VERSION=1.2.1 +cd ~/go/src/github.com/cunnie/sslip.io git pull -r sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" k8s/document_root/index.html # update the download instructions on the website +cd bosh-release/ lpass show a # refresh LastPass token . ~/workspace/deployments/.envrc # set BOSH auth export BOSH_DEPLOYMENT=sslip.io-dns-server @@ -17,10 +18,12 @@ bosh upload-release bosh -n -d sslip.io-dns-server deploy ~/workspace/deployments/sslip.io-dns-server.yml --recreate bosh instances # record the IP address of the instance IP=10.0.250.22 -dig +short 127.0.0.1.example.com @$IP # 127.0.0.1 -dig +short ns example.com @$IP # ns-aws, ns-azure, ns-gce -dig +short mx example.com @$IP # 1 x themselves -dig +short mx sslip.io @$IP # 2 x protonmail +dig +short 127.0.0.1.example.com @$IP # 127.0.0.1 +dig +short ns example.com @$IP # ns-aws, ns-azure, ns-gce +dig +short mx example.com @$IP # 1 x themselves +dig +short mx sslip.io @$IP # 2 x protonmail +dig +short txt sslip.io @$IP # 2 x protonmail +dig +short txt 127.0.0.1.sslip.io @$IP # no records bosh upload-blobs bosh create-release \ --final \ @@ -28,7 +31,7 @@ bosh create-release \ --version ${VERSION} --force git add -N releases/ .final_builds/ git add -p -git ci -v # BOSH release: 1.2.0: bugfixes +git ci -v # BOSH release: 1.2.1: TXT records git tag $VERSION git push git push --tags diff --git a/k8s/document_root/index.html b/k8s/document_root/index.html index 331ec29..1b6d358 100644 --- a/k8s/document_root/index.html +++ b/k8s/document_root/index.html @@ -159,7 +159,7 @@ src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"> our server within a docker container:

 docker run -it --rm fedora
-curl -L https://github.com/cunnie/sslip.io/releases/download/1.2.0/sslip.io-dns-server-linux-amd64 -o dns-server
+curl -L https://github.com/cunnie/sslip.io/releases/download/1.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