From f6bbdcf0963fdaf5ed4f5522023cf602c6bfac6b Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 15 Mar 2023 20:44:35 +0100
Subject: [PATCH] Update tunnel/maatma IP

---
 checker/checker.go         | 2 +-
 checker/checks.go          | 6 +++---
 libadlin/tunnel.go         | 2 +-
 token-validator/domain.go  | 2 +-
 token-validator/wg.go      | 2 +-
 tutorial/ansible/maatma.md | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/checker/checker.go b/checker/checker.go
index 980d298..79ea136 100644
--- a/checker/checker.go
+++ b/checker/checker.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	DEFAULT_RESOLVER = "2a01:e0a:2b:2250::1"
+	DEFAULT_RESOLVER = "2a01:e0a:518:830::1"
 	year68           = 1 << 31 // For RFC1982 (Serial Arithmetic) calculations in 32 bits. Taken from miekg/dns
 )
 
diff --git a/checker/checks.go b/checker/checks.go
index 92878a8..88c3055 100644
--- a/checker/checks.go
+++ b/checker/checks.go
@@ -141,9 +141,9 @@ func get_GLUE(student *adlin.Student) (aaaa net.IP, err error) {
 	client := dns.Client{Net: "tcp", Timeout: time.Second * 5}
 	domain := student.MyDelegatedDomain()
 
-	dnssrv := "[2a01:e0a:2b:2250::b]:53"
+	dnssrv := "[2a01:e0a:518:830::e]:53"
 	if strings.HasSuffix(domain, student.MyDelegatedDomainSuffix()) {
-		dnssrv = "[2a01:e0a:2b:2250::b]:53"
+		dnssrv = "[2a01:e0a:518:830::e]:53"
 	} else if v, ok := domainsHostingMap[domain]; ok {
 		dnssrv = v
 	} else {
@@ -390,7 +390,7 @@ func check_dnssec(domain, ip string) (err error) {
 	m.RecursionDesired = false
 	m.SetEdns0(4096, true)
 
-	r, _, err = client.Exchange(m, "[2a01:e0a:2b:2250::b]:53")
+	r, _, err = client.Exchange(m, "[2a01:e0a:518:830::e]:53")
 	if err != nil {
 		return
 	}
diff --git a/libadlin/tunnel.go b/libadlin/tunnel.go
index 1f3805b..5c06a57 100644
--- a/libadlin/tunnel.go
+++ b/libadlin/tunnel.go
@@ -29,7 +29,7 @@ func GetCollectorPublic() ed25519.PublicKey {
 }
 
 func StudentIP(idstd int64, overrideid int) net.IP {
-	return net.ParseIP(fmt.Sprintf("2a01:e0a:2b:2252:%x%x::", overrideid, idstd))
+	return net.ParseIP(fmt.Sprintf("2a01:e0a:518:833:%x%x::", overrideid, idstd))
 }
 
 func StudentNet(idstd int64, overrideid int) *net.IPNet {
diff --git a/token-validator/domain.go b/token-validator/domain.go
index 18d8deb..7f552f0 100644
--- a/token-validator/domain.go
+++ b/token-validator/domain.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	ControlSocket = "[2a01:e0a:2b:2250::b]:53"
+	ControlSocket = "[2a01:e0a:518:830::5]:53"
 	tsigName      = "ddns."
 	tsigSecret    = ""
 )
diff --git a/token-validator/wg.go b/token-validator/wg.go
index d564dd3..ec44ba4 100644
--- a/token-validator/wg.go
+++ b/token-validator/wg.go
@@ -67,7 +67,7 @@ func getTunnelInfo(student int64, idoverride int) TunnelInfo {
 		SrvPort:   42912,
 		CltIPv6:   adlin.StudentIP(student, idoverride),
 		CltRange:  adlin.StdNetmask,
-		SrvGW6:    "2a01:e0a:2b:2252::1",
+		SrvGW6:    "2a01:e0a:518:833::1",
 	}
 }
 
diff --git a/tutorial/ansible/maatma.md b/tutorial/ansible/maatma.md
index 71accd7..fc92f17 100644
--- a/tutorial/ansible/maatma.md
+++ b/tutorial/ansible/maatma.md
@@ -61,7 +61,7 @@ Votre passerelle répond aux `ping`, une fois la connexion établie, vous devrie
 pouvoir :
 
 ```
-ping 2a01:e0a:2b:2252::1
+ping 2a01:e0a:518:833::1
 ```