Skip to content

Commit 2bcbca2

Browse files
committed
use update servers for web/network services too
This results in nyc.grapheneos.org being replaced by yto.grapheneos.org along with the previous {lax,mia}.grapheneos.org no longer being needed.
1 parent 3da68e6 commit 2bcbca2

File tree

8 files changed

+41
-41
lines changed

8 files changed

+41
-41
lines changed

zones/0.9.d.4.f.2.0.6.2.ip6.arpa.zone

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ $TTL 3600
99

1010
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.9.d.4.f.2.0.6.2.ip6.arpa. IN PTR ns2.grapheneos.org.
1111

12-
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.5.0.0.0.9.d.4.f.2.0.6.2.ip6.arpa. IN PTR yto.releases.grapheneos.org.
12+
1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.0.0.5.0.0.0.9.d.4.f.2.0.6.2.ip6.arpa. IN PTR yto.grapheneos.org.

zones/30.246.91.in-addr.arpa.zone

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ $TTL 3600
55
@ 86400 IN NS ns1.grapheneos.org.
66
@ 86400 IN NS ns2.grapheneos.org.
77

8-
2 IN PTR yto.releases.grapheneos.org.
8+
2 IN PTR yto.grapheneos.org.

zones/grapheneos-domain.zone

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$INCLUDE base.zone
22

3-
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/2836507046"
4-
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/246681953"
3+
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/2919943146"
4+
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/254068453"
55
@ IN CAA 0 issuemail ";"
66
@ IN CAA 0 issuevmc ";"
77
@ IN CAA 0 iodef "mailto:caa@grapheneos.org"

zones/grapheneos.org.zone

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -118,30 +118,24 @@ tyo.ns2 86400 IN MX 0 .
118118
tyo.ns2 IN SSHFP 4 2 c40764eda3cc12714ce6ad1107d9a16cd0cc111737021de4aac5c4fa9614aaa4
119119
tyo.ns2 IN TXT "v=spf1 -all"
120120

121-
; Vultr Los Angeles
122-
lax IN A 149.248.15.194
123-
lax IN AAAA 2001:19f0:6000:3d01:5400:5ff:feed:bc8e
121+
; ReliableSite Los Angeles
122+
lax IN A 104.194.8.203
123+
lax IN AAAA 2605:9880:200:400:135:7700:ef0a:81
124124
lax 86400 IN MX 0 .
125-
lax IN SSHFP 4 2 a022ebc589ac4c6c4b3d41b10ae7e9e2049f0ef57f84cace1e25548ea49d2257
125+
lax IN SSHFP 4 2 8d38a340245e80f3f2b111b4b7750d88300ddb8ce76974e2070f3a3f8b49711c
126126
lax IN TXT "v=spf1 -all"
127-
; Vultr Miami
128-
mia IN A 104.207.147.19
129-
mia IN AAAA 2001:19f0:9000:2605:5400:05ff:feed:7df5
127+
; ReliableSite Miami
128+
mia IN A 172.96.172.37
129+
mia IN AAAA 2605:9880:400:1100:15:1240:515:6e
130130
mia 86400 IN MX 0 .
131-
mia IN SSHFP 4 2 097fcdea75eedd4b00b55ac57d9709c2fe3f8d57320881a3b2fcf4df6c4aa24f
131+
mia IN SSHFP 4 2 0decd3969913117880989249045f538562923afad7f24c973588ef2d3146790c
132132
mia IN TXT "v=spf1 -all"
133133
; netcup Nuremberg
134134
nue IN A 159.195.46.80
135135
nue IN AAAA 2a0a:4cc0:c1:9de2::1
136136
nue 86400 IN MX 0 .
137137
nue IN SSHFP 4 2 207210710708cad2f373601e8e3a5960a4f08218cc86e790118934f606435e70
138138
nue IN TXT "v=spf1 -all"
139-
; BuyVM New York City
140-
nyc IN A 198.98.62.94
141-
nyc IN AAAA 2605:6400:10:50:20a1:d9ea:5c10:a895
142-
nyc 86400 IN MX 0 .
143-
nyc IN SSHFP 4 2 8352e1002eea81a0b2ee25a70205b4ee90e4048c1ffb186f956fb47ba1543b07
144-
nyc IN TXT "v=spf1 -all"
145139
; Vultr São Paulo
146140
sao IN A 216.238.116.202
147141
sao IN AAAA 2001:19f0:b800:1f13:5400:05ff:fed0:8ea7
@@ -172,6 +166,17 @@ tyo IN AAAA 2401:c080:1000:13f8:5400:05ff:fee8:3c8b
172166
tyo 86400 IN MX 0 .
173167
tyo IN SSHFP 4 2 831f9be47ec221642294d41ada734b2623dadbe37f18784495a8d7bdbdc6dc62
174168
tyo IN TXT "v=spf1 -all"
169+
; Xenyth Toronto
170+
yto IN A 91.246.30.2
171+
yto IN AAAA 2602:f4d9:5:1::1
172+
yto 86400 IN MX 0 .
173+
yto IN SSHFP 4 2 af1d5aaad371582f44ad7a84a8bbaf90825c54c8f41bc4a5fd390c988ead900d
174+
yto IN TXT "v=spf1 -all"
175+
fallback.yto IN A 207.174.104.20
176+
fallback.yto IN AAAA 2602:fd50:1a1:20::2
177+
fallback.yto 86400 IN MX 0 .
178+
fallback.yto IN SSHFP 4 2 af1d5aaad371582f44ad7a84a8bbaf90825c54c8f41bc4a5fd390c988ead900d
179+
fallback.yto IN TXT "v=spf1 -all"
175180

176181
$INCLUDE grapheneos-domain.zone
177182

@@ -222,11 +227,6 @@ yto.releases IN AAAA 2602:f4d9:5:1::1
222227
yto.releases 86400 IN MX 0 .
223228
yto.releases IN SSHFP 4 2 af1d5aaad371582f44ad7a84a8bbaf90825c54c8f41bc4a5fd390c988ead900d
224229
yto.releases IN TXT "v=spf1 -all"
225-
fallback.yto.releases IN A 207.174.104.20
226-
fallback.yto.releases IN AAAA 2602:fd50:1a1:20::2
227-
fallback.yto.releases 86400 IN MX 0 .
228-
fallback.yto.releases IN SSHFP 4 2 af1d5aaad371582f44ad7a84a8bbaf90825c54c8f41bc4a5fd390c988ead900d
229-
fallback.yto.releases IN TXT "v=spf1 -all"
230230

231231
$ORIGIN releases.grapheneos.org.
232232
$INCLUDE lua-releases.zone

zones/lua-grapheneos.zone

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@ 300 IN LUA A (";"
2-
" local ips_na_south_east = {'104.207.147.19'}"
3-
" local ips_na_north_east = {'198.98.62.94'}"
4-
" local ips_na_south_west = {'149.248.15.194'}"
2+
" local ips_na_south_east = {'172.96.172.37'}"
3+
" local ips_na_north_east = {'91.246.30.2'}"
4+
" local ips_na_south_west = {'104.194.8.203'}"
55
" local ips_na_north_west = {'45.32.230.4'}"
66
" local ips_sa = {'216.238.116.202'}"
77
" local ips_eu = {'159.195.46.80'}"
@@ -73,9 +73,9 @@
7373
" local result = ifurlup('https://grapheneos.org/robots.txt', ips, {selector='all', backupSelector='all'})"
7474
" if #result > 1 then return ips[1] else return result end")
7575
@ 300 IN LUA AAAA (";"
76-
" local ips_na_south_east = {'2001:19f0:9000:2605:5400:05ff:feed:7df5'}"
77-
" local ips_na_north_east = {'2605:6400:10:50:20a1:d9ea:5c10:a895'}"
78-
" local ips_na_south_west = {'2001:19f0:6000:3d01:5400:05ff:feed:bc8e'}"
76+
" local ips_na_south_east = {'2605:9880:400:1100:15:1240:515:6e'}"
77+
" local ips_na_north_east = {'2602:f4d9:5:1::1'}"
78+
" local ips_na_south_west = {'2605:9880:200:400:135:7700:ef0a:81'}"
7979
" local ips_na_north_west = {'2001:19f0:8000:3454:5400:05ff:fec8:4139'}"
8080
" local ips_sa = {'2001:19f0:b800:1f13:5400:05ff:fed0:8ea7'}"
8181
" local ips_eu = {'2a0a:4cc0:c1:9de2::1'}"

zones/lua-health.zone

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ health 300 IN LUA TXT (";"
44
" end"
55
" local ips"
66
" ips = {"
7-
" '149.248.15.194'," ; lax
8-
" '104.207.147.19'," ; mia
7+
" '104.194.8.203'," ; lax
8+
" '172.96.172.37'," ; mia
99
" '159.195.46.80'," ; nue
10-
" '198.98.62.94'," ; nyc
1110
" '216.238.116.202'," ; sao
1211
" '45.32.230.4'," ; sea
1312
" '66.42.50.166'," ; sin
1413
" '107.191.57.135'," ; syd
1514
" '207.148.108.82'," ; tyo
15+
" '91.246.30.2'," ; yto
1616
" }"
1717
" ifurlup('https://grapheneos.org/robots.txt', ips, {selector='all', backupSelector='all'})"
1818
" ifurlup('https://broadcom.psds.grapheneos.org/rtistatus.dat', ips, {selector='all', backupSelector='all'})"
1919
" ips = {"
20-
" '2001:19f0:6000:3d01:5400:5ff:feed:bc8e'," ; lax
21-
" '2001:19f0:9000:2605:5400:05ff:feed:7df5'," ; mia
20+
" '2605:9880:200:400:135:7700:ef0a:81'," ; lax
21+
" '2605:9880:400:1100:15:1240:515:6e'," ; mia
2222
" '2a0a:4cc0:c1:9de2::1'," ; nue
23-
" '2605:6400:10:50:20a1:d9ea:5c10:a895'," ; nyc
2423
" '2001:19f0:b800:1f13:5400:05ff:fed0:8ea7'," ; sao
2524
" '2001:19f0:8000:3454:5400:05ff:fec8:4139'," ; sea
2625
" '2001:19f0:4400:2c24:5400:05ff:fec7:4cdc'," ; sin
2726
" '2401:c080:1800:1c40:5400:05ff:fec7:c902'," ; syd
2827
" '2401:c080:1000:13f8:5400:05ff:fee8:3c8b'," ; tyo
28+
" '2602:f4d9:5:1::1'," ; yto
2929
" }"
3030
" ifurlup('https://grapheneos.org/robots.txt', ips, {selector='all', backupSelector='all'})"
3131
" ifurlup('https://broadcom.psds.grapheneos.org/rtistatus.dat', ips, {selector='all', backupSelector='all'})"

zones/lua-network.zone

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@ 300 IN LUA A (";"
2-
" local ips_na_south_east = {'104.207.147.19'}"
2+
" local ips_na_south_east = {'172.96.172.37'}"
33
" local ips_na_north_east = {'198.98.62.94'}"
4-
" local ips_na_south_west = {'149.248.15.194'}"
4+
" local ips_na_south_west = {'104.194.8.203'}"
55
" local ips_na_north_west = {'45.32.230.4'}"
66
" local ips_sa = {'216.238.116.202'}"
77
" local ips_eu = {'159.195.46.80'}"
@@ -73,9 +73,9 @@
7373
" local result = ifurlup('https://broadcom.psds.grapheneos.org/rtistatus.dat', ips, {selector='all', backupSelector='all'})"
7474
" if #result > 1 then return ips[1] else return result end")
7575
@ 300 IN LUA AAAA (";"
76-
" local ips_na_south_east = {'2001:19f0:9000:2605:5400:05ff:feed:7df5'}"
76+
" local ips_na_south_east = {'2605:9880:400:1100:15:1240:515:6e'}"
7777
" local ips_na_north_east = {'2605:6400:10:50:20a1:d9ea:5c10:a895'}"
78-
" local ips_na_south_west = {'2001:19f0:6000:3d01:5400:05ff:feed:bc8e'}"
78+
" local ips_na_south_west = {'2605:9880:200:400:135:7700:ef0a:81'}"
7979
" local ips_na_north_west = {'2001:19f0:8000:3454:5400:05ff:fec8:4139'}"
8080
" local ips_sa = {'2001:19f0:b800:1f13:5400:05ff:fed0:8ea7'}"
8181
" local ips_eu = {'2a0a:4cc0:c1:9de2::1'}"

zones/network-domain.zone

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
$INCLUDE base.zone
22

33
$INCLUDE lua-network.zone
4-
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/2836507046"
5-
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/246681953"
4+
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-v02.api.letsencrypt.org/acme/acct/2919943146"
5+
@ IN CAA 0 issue "letsencrypt.org; validationmethods=http-01; accounturi=https://acme-staging-v02.api.letsencrypt.org/acme/acct/254068453"
66
@ IN CAA 0 issuemail ";"
77
@ IN CAA 0 issuevmc ";"
88
@ IN CAA 0 iodef "mailto:caa@grapheneos.org"

0 commit comments

Comments
 (0)