From 384c29bd5e6306ed4386390d46d761f95556a8f2 Mon Sep 17 00:00:00 2001
From: Daniel Micay <daniel.micay@grapheneos.org>
Date: Wed, 21 Jun 2023 22:56:50 -0400
Subject: [PATCH] simplify route metric configuration

---
 systemd/network/0.grapheneos.network.network       | 1 -
 systemd/network/0.grapheneos.org.network           | 1 -
 systemd/network/0.releases.grapheneos.org.network  | 1 -
 systemd/network/1.grapheneos.network.network       | 1 -
 systemd/network/1.grapheneos.org.network           | 1 -
 systemd/network/1.releases.grapheneos.org.network  | 1 -
 systemd/network/2.grapheneos.network.network       | 1 -
 systemd/network/2.grapheneos.org.network           | 1 -
 systemd/network/2.releases.grapheneos.org.network  | 1 -
 systemd/network/3.releases.grapheneos.org.network  | 1 -
 systemd/network/4.releases.grapheneos.org.network  | 1 -
 systemd/network/5.releases.grapheneos.org.network  | 1 -
 systemd/network/6.releases.grapheneos.org.network  | 1 -
 systemd/network/7.releases.grapheneos.org.network  | 1 -
 systemd/network/attestation.app.network            | 1 -
 systemd/network/discuss.grapheneos.org.network     | 1 -
 systemd/network/grapheneos.social.network          | 1 -
 systemd/network/mail.grapheneos.org.network        | 3 +--
 systemd/network/matrix.grapheneos.org.network      | 1 -
 systemd/network/ns1.grapheneos.org.network         | 1 -
 systemd/network/staging.attestation.app.network    | 1 -
 systemd/network/staging.grapheneos.org.network     | 1 -
 systemd/network/staging.ns1.grapheneos.org.network | 1 -
 23 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/systemd/network/0.grapheneos.network.network b/systemd/network/0.grapheneos.network.network
index 8a6d28d..a6dffce 100644
--- a/systemd/network/0.grapheneos.network.network
+++ b/systemd/network/0.grapheneos.network.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/0.grapheneos.org.network b/systemd/network/0.grapheneos.org.network
index 787e2bc..752f01e 100644
--- a/systemd/network/0.grapheneos.org.network
+++ b/systemd/network/0.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:201:3100::1
 Destination=2607:5300:201:3100::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/0.releases.grapheneos.org.network b/systemd/network/0.releases.grapheneos.org.network
index 61f1309..2244553 100644
--- a/systemd/network/0.releases.grapheneos.org.network
+++ b/systemd/network/0.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:201:3100::1
 Destination=2607:5300:201:3100::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/1.grapheneos.network.network b/systemd/network/1.grapheneos.network.network
index d8aaaa1..87179bd 100644
--- a/systemd/network/1.grapheneos.network.network
+++ b/systemd/network/1.grapheneos.network.network
@@ -11,7 +11,6 @@ Gateway=2001:41d0:304:200::1
 Destination=2001:41d0:304:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/1.grapheneos.org.network b/systemd/network/1.grapheneos.org.network
index 2ac211b..58fb730 100644
--- a/systemd/network/1.grapheneos.org.network
+++ b/systemd/network/1.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2001:41d0:304:200::1
 Destination=2001:41d0:304:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/1.releases.grapheneos.org.network b/systemd/network/1.releases.grapheneos.org.network
index 00cb0fe..9cf898e 100644
--- a/systemd/network/1.releases.grapheneos.org.network
+++ b/systemd/network/1.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/2.grapheneos.network.network b/systemd/network/2.grapheneos.network.network
index 8229ad9..64a1ee8 100644
--- a/systemd/network/2.grapheneos.network.network
+++ b/systemd/network/2.grapheneos.network.network
@@ -11,7 +11,6 @@ Gateway=2402:1f00:8000:800::1
 Destination=2402:1f00:8000:800::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/2.grapheneos.org.network b/systemd/network/2.grapheneos.org.network
index 1e4a83a..44acfc8 100644
--- a/systemd/network/2.grapheneos.org.network
+++ b/systemd/network/2.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2402:1f00:8000:800::1
 Destination=2402:1f00:8000:800::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/2.releases.grapheneos.org.network b/systemd/network/2.releases.grapheneos.org.network
index c0d6a07..2459280 100644
--- a/systemd/network/2.releases.grapheneos.org.network
+++ b/systemd/network/2.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/3.releases.grapheneos.org.network b/systemd/network/3.releases.grapheneos.org.network
index ca1d7ca..e8d43f3 100644
--- a/systemd/network/3.releases.grapheneos.org.network
+++ b/systemd/network/3.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/4.releases.grapheneos.org.network b/systemd/network/4.releases.grapheneos.org.network
index 19e867f..a6c3788 100644
--- a/systemd/network/4.releases.grapheneos.org.network
+++ b/systemd/network/4.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2001:41d0:304:200::1
 Destination=2001:41d0:304:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/5.releases.grapheneos.org.network b/systemd/network/5.releases.grapheneos.org.network
index 729d4ba..a79af75 100644
--- a/systemd/network/5.releases.grapheneos.org.network
+++ b/systemd/network/5.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2001:41d0:304:200::1
 Destination=2001:41d0:304:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/6.releases.grapheneos.org.network b/systemd/network/6.releases.grapheneos.org.network
index 0bcc50a..6e28e88 100644
--- a/systemd/network/6.releases.grapheneos.org.network
+++ b/systemd/network/6.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2001:41d0:701:1100::1
 Destination=2001:41d0:701:1100::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/7.releases.grapheneos.org.network b/systemd/network/7.releases.grapheneos.org.network
index ed19c37..3a1cae3 100644
--- a/systemd/network/7.releases.grapheneos.org.network
+++ b/systemd/network/7.releases.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2001:41d0:701:1100::1
 Destination=2001:41d0:701:1100::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/attestation.app.network b/systemd/network/attestation.app.network
index d8e9585..8db4759 100644
--- a/systemd/network/attestation.app.network
+++ b/systemd/network/attestation.app.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/discuss.grapheneos.org.network b/systemd/network/discuss.grapheneos.org.network
index 1e33d37..dc6c8e6 100644
--- a/systemd/network/discuss.grapheneos.org.network
+++ b/systemd/network/discuss.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/grapheneos.social.network b/systemd/network/grapheneos.social.network
index 21190e5..0587377 100644
--- a/systemd/network/grapheneos.social.network
+++ b/systemd/network/grapheneos.social.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/mail.grapheneos.org.network b/systemd/network/mail.grapheneos.org.network
index 75ed719..05b3764 100644
--- a/systemd/network/mail.grapheneos.org.network
+++ b/systemd/network/mail.grapheneos.org.network
@@ -12,13 +12,12 @@ Gateway=2607:5300:205:200::1
 Destination=0.0.0.0/0
 Gateway=51.161.8.1
 PreferredSource=192.99.98.22
-Metric=50
+Metric=512
 
 [Route]
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/matrix.grapheneos.org.network b/systemd/network/matrix.grapheneos.org.network
index d737578..3d52ce1 100644
--- a/systemd/network/matrix.grapheneos.org.network
+++ b/systemd/network/matrix.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/ns1.grapheneos.org.network b/systemd/network/ns1.grapheneos.org.network
index d7f9a99..8b4c8f5 100644
--- a/systemd/network/ns1.grapheneos.org.network
+++ b/systemd/network/ns1.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/staging.attestation.app.network b/systemd/network/staging.attestation.app.network
index 39549e8..a2470ce 100644
--- a/systemd/network/staging.attestation.app.network
+++ b/systemd/network/staging.attestation.app.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/staging.grapheneos.org.network b/systemd/network/staging.grapheneos.org.network
index 9cebdd1..65dc5e3 100644
--- a/systemd/network/staging.grapheneos.org.network
+++ b/systemd/network/staging.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]
diff --git a/systemd/network/staging.ns1.grapheneos.org.network b/systemd/network/staging.ns1.grapheneos.org.network
index fda29d1..969d346 100644
--- a/systemd/network/staging.ns1.grapheneos.org.network
+++ b/systemd/network/staging.ns1.grapheneos.org.network
@@ -11,7 +11,6 @@ Gateway=2607:5300:205:200::1
 Destination=2607:5300:205:200::1
 
 [DHCP]
-RouteMetric=100
 UseMTU=true
 
 [CAKE]