From 8d55c534fc73f1f53f0c080619b5d2bae7fc04d3 Mon Sep 17 00:00:00 2001 From: Brian Cunnie Date: Fri, 22 Apr 2022 07:59:10 -0700 Subject: [PATCH] Make way for k-v.io HTML website To make room for the k-v.io HTML website, we rename the `document_root` of the sslip.io website to the more explicit `document_root_sslip.io`. --- README.md | 4 ++-- docs/DEVELOPER.md | 8 ++++---- k8s/Dockerfile-nginx | 2 +- .../about.html | 0 .../css/starter-template.css | 0 .../faq.html | 0 .../img/cert_chain.png | Bin .../img/favicon.ico | Bin .../img/green_lock.png | Bin .../img/red_lock.png | Bin .../index.html | 0 11 files changed, 7 insertions(+), 7 deletions(-) rename k8s/{document_root => document_root_sslip.io}/about.html (100%) rename k8s/{document_root => document_root_sslip.io}/css/starter-template.css (100%) rename k8s/{document_root => document_root_sslip.io}/faq.html (100%) rename k8s/{document_root => document_root_sslip.io}/img/cert_chain.png (100%) rename k8s/{document_root => document_root_sslip.io}/img/favicon.ico (100%) rename k8s/{document_root => document_root_sslip.io}/img/green_lock.png (100%) rename k8s/{document_root => document_root_sslip.io}/img/red_lock.png (100%) rename k8s/{document_root => document_root_sslip.io}/index.html (100%) diff --git a/README.md b/README.md index 7874f47..9bad9bd 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ sudo ~/go/bin/ginkgo -r . ```bash DOMAIN=sslip.io rspec --format documentation --color spec/ ``` -- `k8s/document_root/` contains the HTML content of the sslip.io website. Please - run `tidy -im -w 120 k8s/document_root/index.html` before submitting pull +- `k8s/document_root_sslip.io/` contains the HTML content of the sslip.io website. Please + run `tidy -im -w 120 k8s/document_root_sslip.io/index.html` before submitting pull requests - `bosh-release/` _[deprecated]_ contains the [BOSH](https://bosh.io/docs/) release. BOSH is the mechanism we previously used to deploy the servers, and diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index aeb14aa..1602a38 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -14,7 +14,7 @@ sed -i '' "s/$OLD_VERSION/$VERSION/g" \ spec/check-dns_spec.rb # update the download instructions on the website sed -i '' "s~/$OLD_VERSION/~/$VERSION/~g" \ - k8s/document_root/index.html \ + k8s/document_root_sslip.io/index.html \ k8s/Dockerfile-sslip.io-dns-server # update the git hash for the TXT record for version.status.sslip.io for BOSH release sed -i '' "s/VersionGitHash=[0-9a-fA-F]*/VersionGitHash=$(git rev-parse --short HEAD)/g" \ @@ -93,9 +93,9 @@ fly -t nono trigger-job -j dockerfiles/build-and-push-sslip.io-dns-server ``` Update the webservers with the HTML with new versions: ```bash -ssh nono.io curl -L -o /www/sslip.io/document_root/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root/index.html -ssh ns-aws.sslip.io curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root/index.html -ssh ns-azure.sslip.io curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root/index.html +ssh nono.io curl -L -o /www/sslip.io/document_root_sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html +ssh ns-aws.sslip.io curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html +ssh ns-azure.sslip.io curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html ``` Update GCP/GKE with the new executable: ```bash diff --git a/k8s/Dockerfile-nginx b/k8s/Dockerfile-nginx index 4ff7b64..0b797cd 100644 --- a/k8s/Dockerfile-nginx +++ b/k8s/Dockerfile-nginx @@ -26,7 +26,7 @@ RUN dnf install -y nginx RUN mv /usr/share/nginx/html /usr/share/nginx/html-orig -COPY document_root /usr/share/nginx/html +COPY document_root_sslip.io /usr/share/nginx/html ENTRYPOINT [ "/usr/sbin/nginx", "-g", "daemon off;" ] diff --git a/k8s/document_root/about.html b/k8s/document_root_sslip.io/about.html similarity index 100% rename from k8s/document_root/about.html rename to k8s/document_root_sslip.io/about.html diff --git a/k8s/document_root/css/starter-template.css b/k8s/document_root_sslip.io/css/starter-template.css similarity index 100% rename from k8s/document_root/css/starter-template.css rename to k8s/document_root_sslip.io/css/starter-template.css diff --git a/k8s/document_root/faq.html b/k8s/document_root_sslip.io/faq.html similarity index 100% rename from k8s/document_root/faq.html rename to k8s/document_root_sslip.io/faq.html diff --git a/k8s/document_root/img/cert_chain.png b/k8s/document_root_sslip.io/img/cert_chain.png similarity index 100% rename from k8s/document_root/img/cert_chain.png rename to k8s/document_root_sslip.io/img/cert_chain.png diff --git a/k8s/document_root/img/favicon.ico b/k8s/document_root_sslip.io/img/favicon.ico similarity index 100% rename from k8s/document_root/img/favicon.ico rename to k8s/document_root_sslip.io/img/favicon.ico diff --git a/k8s/document_root/img/green_lock.png b/k8s/document_root_sslip.io/img/green_lock.png similarity index 100% rename from k8s/document_root/img/green_lock.png rename to k8s/document_root_sslip.io/img/green_lock.png diff --git a/k8s/document_root/img/red_lock.png b/k8s/document_root_sslip.io/img/red_lock.png similarity index 100% rename from k8s/document_root/img/red_lock.png rename to k8s/document_root_sslip.io/img/red_lock.png diff --git a/k8s/document_root/index.html b/k8s/document_root_sslip.io/index.html similarity index 100% rename from k8s/document_root/index.html rename to k8s/document_root_sslip.io/index.html