diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md index d67c561..9092d32 100644 --- a/docs/DEVELOPER.md +++ b/docs/DEVELOPER.md @@ -119,7 +119,7 @@ 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_sslip.io/index.html ssh nono.io curl -L -o /www/nip.io/document_root/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_nip.io/index.html -for HOST in {blocked,ns-do-sg,ns-gce,ns-hetzner,ns-ovh,ns-ovh-sg}.sslip.io; do +for HOST in {blocked,ns-do-sg,ns-gce,ns-hetzner,ns-ovh}.sslip.io; do ssh $HOST curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html done ``` diff --git a/main.go b/main.go index 1762c3f..7435912 100644 --- a/main.go +++ b/main.go @@ -42,8 +42,6 @@ func main() { "ns-hetzner.sslip.io=2a01:4ff:1f0:c920::,"+ "ns-ovh.sslip.io=51.75.53.19,"+ "ns-ovh.sslip.io=2001:41d0:602:2313::1,"+ - "ns-ovh-sg.sslip.io=51.79.178.89,"+ - "ns-ovh-sg.sslip.io=2402:1f00:8001:d59::1"+ "ns1.nip.io=51.75.53.19,"+ "ns1.nip.io=2001:41d0:602:2313::1,"+ "ns2.nip.io=5.78.115.44,"+ diff --git a/xip/xip_test.go b/xip/xip_test.go index 22b45d9..2cfa0b0 100644 --- a/xip/xip_test.go +++ b/xip/xip_test.go @@ -79,14 +79,14 @@ var _ = Describe("Xip", func() { Describe("NSResources()", func() { When("we use the default nameservers", func() { - var x, _ = xip.NewXip("file:///", []string{"ns-hetzner.sslip.io.", "ns-ovh.sslip.io.", "ns-ovh-sg.sslip.io."}, []string{}, []string{}) + var x, _ = xip.NewXip("file:///", []string{"ns-hetzner.sslip.io.", "ns-ovh.sslip.io.", "ns-do-sg.sslip.io."}, []string{}, []string{}) It("returns the name servers", func() { randomDomain := testhelper.Random8ByteString() + ".com." ns := x.NSResources(randomDomain) Expect(len(ns)).To(Equal(3)) Expect(ns[0].NS.String()).To(Equal("ns-hetzner.sslip.io.")) Expect(ns[1].NS.String()).To(Equal("ns-ovh.sslip.io.")) - Expect(ns[2].NS.String()).To(Equal("ns-ovh-sg.sslip.io.")) + Expect(ns[2].NS.String()).To(Equal("ns-do-sg.sslip.io.")) }) When(`the domain name contains "_acme-challenge."`, func() { When("the domain name has an embedded IP", func() { @@ -112,13 +112,13 @@ var _ = Describe("Xip", func() { When("we delegate domains to other nameservers", func() { When(`we don't use the "=" in the arguments`, func() { It("returns an informative log message", func() { - var _, logs = xip.NewXip("file://etc/blocklist-test.txt", []string{"ns-hetzner.sslip.io.", "ns-ovh.sslip.io.", "ns-ovh-sg.sslip.io."}, []string{}, []string{"noEquals"}) + var _, logs = xip.NewXip("file://etc/blocklist-test.txt", []string{"ns-hetzner.sslip.io.", "ns-ovh.sslip.io.", "ns-do-sg.sslip.io."}, []string{}, []string{"noEquals"}) Expect(strings.Join(logs, "")).To(MatchRegexp(`"-delegates: arguments should be in the format "delegatedDomain=nameserver", not "noEquals"`)) }) }) When(`there's no "." at the end of the delegated domain or nameserver`, func() { It(`helpfully adds the "."`, func() { - var x, logs = xip.NewXip("file://etc/blocklist-test.txt", []string{"ns-hetzner.sslip.io.", "ns-ovh.sslip.io.", "ns-ovh-sg.sslip.io."}, []string{}, []string{"a=b"}) + var x, logs = xip.NewXip("file://etc/blocklist-test.txt", []string{"ns-hetzner.sslip.io.", "ns-ovh.sslip.io.", "ns-do-sg.sslip.io."}, []string{}, []string{"a=b"}) Expect(strings.Join(logs, "")).To(MatchRegexp(`Adding delegated NS record "a\.=b\."`)) ns := x.NSResources("a.") Expect(len(ns)).To(Equal(1))