teach
/
adlin
Archived
0
0
Fork 0
Code Issues 1 Pull Requests 4 Releases Activity

Update tunnel/maatma IP
continuous-integration/drone/push Build is passing Details

This commit is contained in:
nemunaire 2023-03-15 20:44:35 +01:00
parent c7560f8332
commit f6bbdcf096
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
checker/checker.go
View File

@ -12,7 +12,7 @@ import (
) )
const ( 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 year68 = 1 << 31 // For RFC1982 (Serial Arithmetic) calculations in 32 bits. Taken from miekg/dns
) )

6
checker/checks.go
View File

@ -141,9 +141,9 @@ func get_GLUE(student *adlin.Student) (aaaa net.IP, err error) {
client := dns.Client{Net: "tcp", Timeout: time.Second * 5} client := dns.Client{Net: "tcp", Timeout: time.Second * 5}
domain := student.MyDelegatedDomain() domain := student.MyDelegatedDomain()
dnssrv := "[2a01:e0a:2b:2250::b]:53" dnssrv := "[2a01:e0a:518:830::e]:53"
if strings.HasSuffix(domain, student.MyDelegatedDomainSuffix()) { 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 { } else if v, ok := domainsHostingMap[domain]; ok {
dnssrv = v dnssrv = v
} else { } else {
@ -390,7 +390,7 @@ func check_dnssec(domain, ip string) (err error) {
m.RecursionDesired = false m.RecursionDesired = false
m.SetEdns0(4096, true) 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 { if err != nil {
return return
} }

2
libadlin/tunnel.go
View File

@ -29,7 +29,7 @@ func GetCollectorPublic() ed25519.PublicKey {
} }
func StudentIP(idstd int64, overrideid int) net.IP { 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 { func StudentNet(idstd int64, overrideid int) *net.IPNet {

2
token-validator/domain.go
View File

@ -16,7 +16,7 @@ import (
) )
var ( var (
ControlSocket = "[2a01:e0a:2b:2250::b]:53" ControlSocket = "[2a01:e0a:518:830::5]:53"
tsigName = "ddns." tsigName = "ddns."
tsigSecret = "" tsigSecret = ""
) )

2
token-validator/wg.go
View File

@ -67,7 +67,7 @@ func getTunnelInfo(student int64, idoverride int) TunnelInfo {
SrvPort: 42912, SrvPort: 42912,
CltIPv6: adlin.StudentIP(student, idoverride), CltIPv6: adlin.StudentIP(student, idoverride),
CltRange: adlin.StdNetmask, CltRange: adlin.StdNetmask,
SrvGW6: "2a01:e0a:2b:2252::1", SrvGW6: "2a01:e0a:518:833::1",
} }
} }

2
tutorial/ansible/maatma.md
View File

@ -61,7 +61,7 @@ Votre passerelle répond aux `ping`, une fois la connexion établie, vous devrie
pouvoir : pouvoir :
``` ```
ping 2a01:e0a:2b:2252::1 ping 2a01:e0a:518:833::1
``` ```