From f1ff8ac9312f73c74e8fe76d573e943cfea94679 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 4 Nov 2025 10:49:32 -0500 Subject: [PATCH] phase out 2.releases.grapheneos.org --- .../network/2.releases.grapheneos.org.link | 5 --- .../network/2.releases.grapheneos.org.network | 27 ------------ .../2.releases.grapheneos.org.fq.service | 42 ------------------- hosts.sh | 18 +------- packages/2.releases.grapheneos.org | 42 ------------------- 5 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 etc/systemd/network/2.releases.grapheneos.org.link delete mode 100644 etc/systemd/network/2.releases.grapheneos.org.network delete mode 100644 etc/systemd/system/2.releases.grapheneos.org.fq.service delete mode 100644 packages/2.releases.grapheneos.org diff --git a/etc/systemd/network/2.releases.grapheneos.org.link b/etc/systemd/network/2.releases.grapheneos.org.link deleted file mode 100644 index e5b4d97..0000000 --- a/etc/systemd/network/2.releases.grapheneos.org.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -MACAddress=50:7c:6f:7d:4c:93 - -[Link] -Name=public diff --git a/etc/systemd/network/2.releases.grapheneos.org.network b/etc/systemd/network/2.releases.grapheneos.org.network deleted file mode 100644 index 39dac91..0000000 --- a/etc/systemd/network/2.releases.grapheneos.org.network +++ /dev/null @@ -1,27 +0,0 @@ -[Match] -Name=public - -[Network] -LinkLocalAddressing=no -Address=185.225.24.20/24 -Address=185.225.24.21/24 -Address=2a14:3f87:6920:250::100/60 -Address=2a14:3f87:6920:250::101/60 - -[Route] -Destination=0.0.0.0/0 -Gateway=185.225.24.1 -PreferredSource=185.225.24.20 - -[Route] -Destination=185.225.24.1 -PreferredSource=185.225.24.20 - -[Route] -Destination=::/0 -Gateway=2a14:3f87:6920:250::1 -PreferredSource=2a14:3f87:6920:250::100 - -[Route] -Destination=2a14:3f87:6920:250::1 -PreferredSource=2a14:3f87:6920:250::100 diff --git a/etc/systemd/system/2.releases.grapheneos.org.fq.service b/etc/systemd/system/2.releases.grapheneos.org.fq.service deleted file mode 100644 index adaee64..0000000 --- a/etc/systemd/system/2.releases.grapheneos.org.fq.service +++ /dev/null @@ -1,42 +0,0 @@ -[Unit] -Requires=sys-subsystem-net-devices-public.device -After=sys-subsystem-net-devices-public.device - -[Service] -Type=oneshot -ExecStart=/usr/bin/tc qdisc replace dev public root handle 1 mq -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:1 handle 1001 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:2 handle 1002 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:3 handle 1003 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:4 handle 1004 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:5 handle 1005 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:6 handle 1006 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:7 handle 1007 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:8 handle 1008 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:9 handle 1009 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:a handle 100a fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:b handle 100b fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:c handle 100c fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:d handle 100d fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:e handle 100e fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:f handle 100f fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:10 handle 1010 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:11 handle 1011 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:12 handle 1012 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:13 handle 1013 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:14 handle 1014 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:15 handle 1015 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:16 handle 1016 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:17 handle 1017 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:18 handle 1018 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:19 handle 1019 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:1a handle 101a fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:1b handle 101b fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:1c handle 101c fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:1d handle 101d fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:1e handle 101e fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:1f handle 101f fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 -ExecStart=/usr/bin/tc qdisc replace dev public parent 1:20 handle 1020 fq bands 3 priomap 1 2 2 2 0 2 0 0 1 1 1 1 1 1 1 1 - -[Install] -WantedBy=sys-subsystem-net-devices-public.device diff --git a/hosts.sh b/hosts.sh index 68b1a55..ba8f10f 100644 --- a/hosts.sh +++ b/hosts.sh @@ -19,7 +19,6 @@ declare -Ar hosts_hostname=( [3.grapheneos.network]=3-network [0.releases.grapheneos.org]=0-releases [1.releases.grapheneos.org]=1-releases - [2.releases.grapheneos.org]=2-releases [3.releases.grapheneos.org]=3-releases [staging.attestation.app]=staging-attestation [attestation.app]=attestation @@ -31,21 +30,18 @@ declare -Ar hosts_hostname=( declare -Ar hosts_uefi=( [0.releases.grapheneos.org]=true [1.releases.grapheneos.org]=true - [2.releases.grapheneos.org]=true [3.releases.grapheneos.org]=true ) declare -Ar hosts_metal=( [0.releases.grapheneos.org]=true [1.releases.grapheneos.org]=true - [2.releases.grapheneos.org]=true [3.releases.grapheneos.org]=true ) declare -Ar hosts_hardware_watchdog=( [0.releases.grapheneos.org]=true [1.releases.grapheneos.org]=true - [2.releases.grapheneos.org]=true [3.releases.grapheneos.org]=true ) @@ -63,7 +59,6 @@ declare -Ar hosts_authorized_keys=( [2.grapheneos.network]=authorized_keys-replica-grapheneos [3.grapheneos.network]=authorized_keys-replica-grapheneos [1.releases.grapheneos.org]=authorized_keys-replica-releases - [2.releases.grapheneos.org]=authorized_keys-replica-releases [3.releases.grapheneos.org]=authorized_keys-replica-releases [staging.attestation.app]=authorized_keys-staging-attestation ) @@ -89,7 +84,6 @@ declare -Ar hosts_firewall=( [3.grapheneos.network]=network [0.releases.grapheneos.org]=web-fq [1.releases.grapheneos.org]=web-fq - [2.releases.grapheneos.org]=web-fq [3.releases.grapheneos.org]=web-fq [staging.attestation.app]=attestation-fq [attestation.app]=attestation @@ -101,7 +95,6 @@ declare -Ar hosts_firewall=( declare -Ar hosts_swap=( [0.releases.grapheneos.org]=32768 [1.releases.grapheneos.org]=32768 - [2.releases.grapheneos.org]=32768 [3.releases.grapheneos.org]=32768 [attestation.app]=4096 [matrix.grapheneos.org]=8192 @@ -112,7 +105,6 @@ declare -Ar hosts_swap=( declare -Ar hosts_agcount=( [0.releases.grapheneos.org]=24 [1.releases.grapheneos.org]=24 - [2.releases.grapheneos.org]=32 [3.releases.grapheneos.org]=32 ) @@ -128,7 +120,6 @@ declare -Ar hosts_reserved_ports=( declare -Ar hosts_tcp_wmem_max=( [0.releases.grapheneos.org]=33554432 [1.releases.grapheneos.org]=33554432 - [2.releases.grapheneos.org]=33554432 [3.releases.grapheneos.org]=33554432 [matrix.grapheneos.org]=16777216 ) @@ -165,7 +156,6 @@ declare -Ar hosts_conntrack_size=( [3.grapheneos.network]=131072 [0.releases.grapheneos.org]=12582912 [1.releases.grapheneos.org]=12582912 - [2.releases.grapheneos.org]=8388608 [3.releases.grapheneos.org]=8388608 [staging.attestation.app]=65536 [attestation.app]=131072 @@ -191,7 +181,6 @@ declare -Ar hosts_journald_system_max_use=( [3.grapheneos.network]=24G [0.releases.grapheneos.org]=64G [1.releases.grapheneos.org]=64G - [2.releases.grapheneos.org]=64G [3.releases.grapheneos.org]=64G ) @@ -206,7 +195,6 @@ declare -Ar hosts_journald_system_max_file_size=( [3.grapheneos.network]=2G [0.releases.grapheneos.org]=4G [1.releases.grapheneos.org]=4G - [2.releases.grapheneos.org]=4G [3.releases.grapheneos.org]=4G [matrix.grapheneos.org]=1G [discuss.grapheneos.org]=1G @@ -234,7 +222,6 @@ declare -Ar hosts_ipv4_address=( [3.grapheneos.network]=51.79.161.36 [0.releases.grapheneos.org]=172.96.172.37 [1.releases.grapheneos.org]=104.194.8.203 - [2.releases.grapheneos.org]=185.225.24.20 [3.releases.grapheneos.org]=45.88.230.12 [staging.attestation.app]=198.98.57.157 [attestation.app]=51.79.66.27 @@ -264,7 +251,6 @@ declare -Ar hosts_ipv6_address=( [3.grapheneos.network]=2402:1f00:8000:800::1949 [0.releases.grapheneos.org]=2605:9880:400:1100:15:1240:515:6e [1.releases.grapheneos.org]=2605:9880:200:20::113 - [2.releases.grapheneos.org]=2a14:3f87:6920:250::100 [staging.attestation.app]=2605:6400:10:aa9:1c0f:44d3:da15:c0ec [attestation.app]=2607:5300:205:200::7e9 [matrix.grapheneos.org]=2607:5300:205:200::26e1 @@ -319,7 +305,7 @@ readonly hosts_secondary=( {1..2}.ns2.grapheneos.org {1..3}.grapheneos.org {0..3}.grapheneos.network - {1..3}.releases.grapheneos.org + {1,3}.releases.grapheneos.org ) readonly hosts_backup=( @@ -342,7 +328,7 @@ readonly hosts_grapheneos_all=( ) readonly hosts_releases=( - {0..3}.releases.grapheneos.org + {0,1,3}.releases.grapheneos.org ) readonly hosts_attestation=( diff --git a/packages/2.releases.grapheneos.org b/packages/2.releases.grapheneos.org deleted file mode 100644 index efe29dc..0000000 --- a/packages/2.releases.grapheneos.org +++ /dev/null @@ -1,42 +0,0 @@ -amd-ucode -base -chrony -cloud-guest-utils -conntrack-tools -cpupower -dmidecode -dosfstools -efibootmgr -ethtool -fish -htop -ioping -iperf -linux-firmware-amdgpu -linux-firmware-intel -linux-lts -logrotate -man-db -mdadm -moreutils -mtr -neovim -nftables -nginx -nginx-mod-brotli -nmap -openssh -pacman-contrib -pacutils -plocate -pv -rsync -smartmontools -strace -stress -sysstat -tinyxxd -tree -turbostat -unbound -xfsprogs