From ecb8a0235696803f6959799bb53b500def6d4ec7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 5 Aug 2021 23:29:43 -0400 Subject: [PATCH] feat: switch from xip.io to sslip.io xip.io appears to be unsupported after an exodus at basecamp. Switching to sslip.io seems like a decent move. Refs #2574 --- docs/getting-started/install/azure.md | 2 +- plugins/common/functions | 4 ++-- tests/unit/nginx-vhosts_5.bats | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/getting-started/install/azure.md b/docs/getting-started/install/azure.md index 31aa0b7a2..68c063220 100644 --- a/docs/getting-started/install/azure.md +++ b/docs/getting-started/install/azure.md @@ -8,4 +8,4 @@ 4. In your browser of choice, navigate to `http://[dnsNameForPublicIP].[location].cloudapp.azure.com`. Where `[dnsNameForPublicIP]` and `[location]` are template parameters you used to deploy the template. -5. Finish your Dokku setup like you normally would by creating a *new* public/private key pair for your deployments using `ssh-keygen` (don't use the same one as you created in the first step). You should select **Use Virtual Host Naming** and set the **Hostname** to a *public DNS name* that you own such as one you would purchase from [Namecheap](http://namecheap.com). Alternatively thanks to [xip.io](http://xip.io/) you can just use `[yourAzurePublicIP].xip.io` for free. For example, if your public IP is `44.44.44.44` then you would set it to `44.44.44.44.xip.io`. +5. Finish your Dokku setup like you normally would by creating a *new* public/private key pair for your deployments using `ssh-keygen` (don't use the same one as you created in the first step). You should select **Use Virtual Host Naming** and set the **Hostname** to a *public DNS name* that you own such as one you would purchase from [Namecheap](http://namecheap.com). Alternatively thanks to [sslip.io](https://sslip.io/) you can just use `[yourAzurePublicIP].sslip.io` for free. For example, if your public IP is `44.44.44.44` then you would set it to `44.44.44.44.sslip.io`. diff --git a/plugins/common/functions b/plugins/common/functions index 8191c2773..7808ae031 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -832,7 +832,7 @@ get_ipv4_regex() { declare desc="returns ipv4 regex" local RE_IPV4="$(_ipv4_regex)" # Ensure the ip address continues to the end of the line - # Fixes using a wildcard dns service such as xip.io which allows for *..xip.io + # Fixes using a wildcard dns service such as sslip.io which allows for *..sslip.io echo "${RE_IPV4}\$" } @@ -840,7 +840,7 @@ get_ipv6_regex() { declare desc="returns ipv6 regex" local RE_IPV6="$(_ipv6_regex)" # Ensure the ip address continues to the end of the line - # Fixes using a wildcard dns service such as xip.io which allows for *..xip.io + # Fixes using a wildcard dns service such as sslip.io which allows for *..sslip.io echo "${RE_IPV6}\$" } diff --git a/tests/unit/nginx-vhosts_5.bats b/tests/unit/nginx-vhosts_5.bats index 70dbf1971..3724d5801 100644 --- a/tests/unit/nginx-vhosts_5.bats +++ b/tests/unit/nginx-vhosts_5.bats @@ -17,12 +17,12 @@ teardown() { global_teardown } -@test "(nginx-vhosts) nginx:build-config (xip.io style hostnames)" { - echo "127.0.0.1.xip.io.dokku.me" > "$DOKKU_ROOT/VHOST" +@test "(nginx-vhosts) nginx:build-config (sslip.io style hostnames)" { + echo "127.0.0.1.sslip.io.dokku.me" > "$DOKKU_ROOT/VHOST" deploy_app - check_urls http://${TEST_APP}.127.0.0.1.xip.io.dokku.me - assert_http_success http://${TEST_APP}.127.0.0.1.xip.io.dokku.me + check_urls http://${TEST_APP}.127.0.0.1.sslip.io.dokku.me + assert_http_success http://${TEST_APP}.127.0.0.1.sslip.io.dokku.me } @test "(nginx-vhosts) nginx:build-config (dockerfile expose)" {