diff --git a/etc/systemd/network/sin.grapheneos.org.link b/etc/systemd/network/sin.grapheneos.org.link new file mode 100644 index 0000000..f690c5c --- /dev/null +++ b/etc/systemd/network/sin.grapheneos.org.link @@ -0,0 +1,5 @@ +[Match] +MACAddress=56:00:05:c7:4c:dc + +[Link] +Name=public diff --git a/etc/systemd/network/sin.grapheneos.org.network b/etc/systemd/network/sin.grapheneos.org.network new file mode 100644 index 0000000..240317e --- /dev/null +++ b/etc/systemd/network/sin.grapheneos.org.network @@ -0,0 +1,8 @@ +[Match] +Name=public + +[Network] +DHCP=ipv4 + +[DHCP] +UseMTU=true diff --git a/etc/systemd/network/sin0.grapheneos.org.link b/etc/systemd/network/sin0.grapheneos.org.link deleted file mode 100644 index 5daaf3f..0000000 --- a/etc/systemd/network/sin0.grapheneos.org.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -MACAddress=fa:16:3e:ed:88:95 - -[Link] -Name=public diff --git a/etc/systemd/network/sin0.grapheneos.org.network b/etc/systemd/network/sin0.grapheneos.org.network deleted file mode 100644 index 2e2cf7b..0000000 --- a/etc/systemd/network/sin0.grapheneos.org.network +++ /dev/null @@ -1,26 +0,0 @@ -[Match] -Name=public - -[Network] -DHCP=ipv4 -LinkLocalAddressing=no -Address=2402:1f00:8000:800::16d6/128 - -[Route] -Destination=::/0 -Gateway=2402:1f00:8000:800::1 -PreferredSource=2402:1f00:8000:800::16d6 - -[Route] -Destination=2402:1f00:8000:800::1 -PreferredSource=2402:1f00:8000:800::16d6 - -[DHCP] -UseMTU=true - -[CAKE] -Handle=1 -Bandwidth=500M -PriorityQueueingPreset=diffserv4 -FlowIsolationMode=dual-dst-host -SplitGSO=false diff --git a/etc/systemd/network/sin1.grapheneos.org.link b/etc/systemd/network/sin1.grapheneos.org.link deleted file mode 100644 index e8fe239..0000000 --- a/etc/systemd/network/sin1.grapheneos.org.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -MACAddress=fa:16:3e:9a:33:c3 - -[Link] -Name=public diff --git a/etc/systemd/network/sin1.grapheneos.org.network b/etc/systemd/network/sin1.grapheneos.org.network deleted file mode 100644 index 42472d5..0000000 --- a/etc/systemd/network/sin1.grapheneos.org.network +++ /dev/null @@ -1,26 +0,0 @@ -[Match] -Name=public - -[Network] -DHCP=ipv4 -LinkLocalAddressing=no -Address=2402:1f00:8000:800::1949/128 - -[Route] -Destination=::/0 -Gateway=2402:1f00:8000:800::1 -PreferredSource=2402:1f00:8000:800::1949 - -[Route] -Destination=2402:1f00:8000:800::1 -PreferredSource=2402:1f00:8000:800::1949 - -[DHCP] -UseMTU=true - -[CAKE] -Handle=1 -Bandwidth=500M -PriorityQueueingPreset=diffserv4 -FlowIsolationMode=dual-dst-host -SplitGSO=false diff --git a/hosts.sh b/hosts.sh index 5ae1ba9..73058fa 100644 --- a/hosts.sh +++ b/hosts.sh @@ -22,8 +22,7 @@ declare -Ar hosts_hostname=( [gra.grapheneos.org]=grapheneos-gra [hio.grapheneos.org]=grapheneos-hio [las.grapheneos.org]=grapheneos-las - [sin0.grapheneos.org]=grapheneos-sin0 - [sin1.grapheneos.org]=grapheneos-sin1 + [sin.grapheneos.org]=grapheneos-sin [lax.releases.grapheneos.org]=releases-lax [lon.releases.grapheneos.org]=releases-lon [mia.releases.grapheneos.org]=releases-mia @@ -76,8 +75,7 @@ declare -Ar hosts_authorized_keys=( [gra.grapheneos.org]=authorized_keys-replica-grapheneos [hio.grapheneos.org]=authorized_keys-replica-grapheneos [las.grapheneos.org]=authorized_keys-replica-grapheneos - [sin0.grapheneos.org]=authorized_keys-replica-grapheneos - [sin1.grapheneos.org]=authorized_keys-replica-grapheneos + [sin.grapheneos.org]=authorized_keys-replica-grapheneos [lax.releases.grapheneos.org]=authorized_keys-replica-releases [lon.releases.grapheneos.org]=authorized_keys-replica-releases [staging.attestation.app]=authorized_keys-staging-attestation @@ -107,8 +105,7 @@ declare -Ar hosts_firewall=( [gra.grapheneos.org]=network [hio.grapheneos.org]=network [las.grapheneos.org]=network-fq - [sin0.grapheneos.org]=network - [sin1.grapheneos.org]=network + [sin.grapheneos.org]=network-fq [lax.releases.grapheneos.org]=web-fq [lon.releases.grapheneos.org]=web-fq [mia.releases.grapheneos.org]=web-fq @@ -142,8 +139,7 @@ declare -Ar hosts_reserved_ports=( [gra.grapheneos.org]=7275 [hio.grapheneos.org]=7275 [las.grapheneos.org]=7275 - [sin0.grapheneos.org]=7275 - [sin1.grapheneos.org]=7275 + [sin.grapheneos.org]=7275 [staging.attestation.app]=8080 [attestation.app]=8080 ) @@ -191,8 +187,7 @@ declare -Ar hosts_conntrack_size=( [gra.grapheneos.org]=131072 [hio.grapheneos.org]=131072 [las.grapheneos.org]=65536 - [sin0.grapheneos.org]=131072 - [sin1.grapheneos.org]=131072 + [sin.grapheneos.org]=65536 [lax.releases.grapheneos.org]=12582912 [lon.releases.grapheneos.org]=8388608 [mia.releases.grapheneos.org]=12582912 @@ -253,8 +248,7 @@ declare -Ar hosts_ipv4_address=( [gra.grapheneos.org]=54.37.41.188 [hio.grapheneos.org]=15.204.8.153 [las.grapheneos.org]=209.141.37.35 - [sin0.grapheneos.org]=51.79.160.50 - [sin1.grapheneos.org]=51.79.161.36 + [sin.grapheneos.org]=66.42.50.166 [lax.releases.grapheneos.org]=104.194.8.203 [lon.releases.grapheneos.org]=45.88.230.12 [mia.releases.grapheneos.org]=172.96.172.37 @@ -289,8 +283,7 @@ declare -Ar hosts_ipv6_address=( [gra.grapheneos.org]=2001:41d0:304:200::902f [hio.grapheneos.org]=2604:2dc0:202:300::23a6 [las.grapheneos.org]=2605:6400:20:387:72d4:dab9:a369:f351 - [sin0.grapheneos.org]=2402:1f00:8000:800::16d6 - [sin1.grapheneos.org]=2402:1f00:8000:800::1949 + [sin.grapheneos.org]=2001:19f0:4400:2c24:5400:05ff:fec7:4cdc [lax.releases.grapheneos.org]=2605:9880:200:400:135:7700:ef0a:81 [mia.releases.grapheneos.org]=2605:9880:400:1100:15:1240:515:6e [staging.attestation.app]=2605:6400:10:aa9:1c0f:44d3:da15:c0ec @@ -359,7 +352,7 @@ readonly hosts_backup=( ) readonly hosts_grapheneos=( - {bhs0,bhs1,fra,gra,hio,las,sin0,sin1}.grapheneos.org + {bhs0,bhs1,fra,gra,hio,las,sin}.grapheneos.org ) readonly hosts_grapheneos_all=( @@ -385,6 +378,7 @@ readonly hosts_web=( matrix.grapheneos.org discuss.grapheneos.org grapheneos.social + sin.grapheneos.org ) readonly hosts_all=( @@ -393,6 +387,7 @@ readonly hosts_all=( readonly hosts_vultr=( {bom,fra,lax,lon,mia,nyc,sea,sin,syd,tyo}.ns1.grapheneos.org + sin.grapheneos.org ) readonly hosts_buyvm=( @@ -405,7 +400,7 @@ readonly hosts_buyvm=( readonly hosts_ovh=( mail.grapheneos.org - {bhs0,bhs1,fra,gra,hio,sin0,sin1}.grapheneos.org + {bhs0,bhs1,fra,gra,hio}.grapheneos.org attestation.app matrix.grapheneos.org discuss.grapheneos.org diff --git a/packages/sin0.grapheneos.org b/packages/sin.grapheneos.org similarity index 100% rename from packages/sin0.grapheneos.org rename to packages/sin.grapheneos.org diff --git a/packages/sin1.grapheneos.org b/packages/sin1.grapheneos.org deleted file mode 100644 index b3b7bbf..0000000 --- a/packages/sin1.grapheneos.org +++ /dev/null @@ -1,35 +0,0 @@ -base -chrony -cloud-guest-utils -conntrack-tools -ethtool -fish -grub -htop -ioping -iperf -linux-lts -logrotate -man-db -moreutils -mtr -neovim -nftables -nginx -nginx-mod-brotli -nginx-mod-stream -nmap -openssh -pacman-contrib -pacutils -plocate -pv -rsync -strace -stress -syslog-ng -sysstat -tinyxxd -tree -unbound -xfsprogs