Fixing postinstall-scripts/network-data.csv and adding data for resolvers.

diff --git a/postinstall-scripts/network-data.csv b/postinstall-scripts/network-data.csv
index 2dbda1acef9dac7ad98e1c51794f9641ac2b16ba..4fefc642ceca1f0bb9bb5c9a2cdcb234a3236a8c 100644 (file)
--- a/postinstall-scripts/network-data.csv
+++ b/postinstall-scripts/network-data.csv
@@ -26,26 +26,26 @@ prd-dnsmaster01.pixelpark.com               ens160  ipv6.method             ignore
 
 prd-dnsmaster01.pixelpark.com          ens192  ipv4.method             manual
 prd-dnsmaster01.pixelpark.com          ens192  ipv4.addresses          217.66.51.125/24
-prd-dnsmaster01.pixelpark.com          ens192  ipv4.routes             ip = 217.66.51.0/24 table=100; ip = 0.0.0.0/0, nh = 217.66.51.1 table=100
-prd-dnsmaster01.pixelpark.com          ens192  ipv4.routing-rules      priority 5 from 217.66.51.0/24 table 100, priority 6 to 217.66.51.0/24 table 100
+prd-dnsmaster01.pixelpark.com          ens192  ipv4.routes             217.66.51.0/24 table=100, 0.0.0.0/0 217.66.51.1 table=100
+prd-dnsmaster01.pixelpark.com          ens192  ipv4.routing-rules      priority 5 from 217.66.51.125 table 100, priority 6 to 217.66.51.125 table 100
 prd-dnsmaster01.pixelpark.com          ens192  ipv6.method             ignore
 
 prd-dnsmaster01.pixelpark.com          ens224  ipv4.method             manual
 prd-dnsmaster01.pixelpark.com          ens224  ipv4.addresses          77.74.232.20/28
-prd-dnsmaster01.pixelpark.com          ens224  ipv4.routes             ip = 77.74.232.16/28 table=200; ip = 0.0.0.0/0, nh = 77.74.232.17 table=200
-prd-dnsmaster01.pixelpark.com          ens224  ipv4.routing-rules      priority 15 from 77.74.232.16/28 table 200, priority 16 to 77.74.232.16/28 table 200
+prd-dnsmaster01.pixelpark.com          ens224  ipv4.routes             77.74.232.16/28 table=200, 0.0.0.0/0 77.74.232.17 table=200
+prd-dnsmaster01.pixelpark.com          ens224  ipv4.routing-rules      priority 15 from 77.74.232.20 table 200, priority 16 to 77.74.232.20 table 200
 prd-dnsmaster01.pixelpark.com          ens224  ipv6.method             ignore
 
 prd-dnsmaster01.pixelpark.com          ens256  ipv4.method             manual
 prd-dnsmaster01.pixelpark.com          ens256  ipv4.addresses          93.188.104.80/25
-prd-dnsmaster01.pixelpark.com          ens256  ipv4.routes             ip = 93.188.104.0/25 table=300; ip = 0.0.0.0/0, nh = 93.188.104.1 table=300
-prd-dnsmaster01.pixelpark.com          ens256  ipv4.routing-rules      priority 25 from 93.188.104.0/25 table 300, priority 26 to 93.188.104.0/25 table 300
+prd-dnsmaster01.pixelpark.com          ens256  ipv4.routes             93.188.104.0/25 table=300, 0.0.0.0/0 93.188.104.1 table=300
+prd-dnsmaster01.pixelpark.com          ens256  ipv4.routing-rules      priority 25 from 93.188.104.80 table 300, priority 26 to 93.188.104.80 table 300
 prd-dnsmaster01.pixelpark.com          ens256  ipv6.method             ignore
 
 prd-dnsmaster01.pixelpark.com          ens161  ipv4.method             manual
 prd-dnsmaster01.pixelpark.com          ens161  ipv4.addresses          93.188.109.5/28,93.188.109.6/28
-prd-dnsmaster01.pixelpark.com          ens161  ipv4.routes             ip = 93.188.109.0/28 table=400; ip = 0.0.0.0/0, nh = 93.188.109.1 table=400
-prd-dnsmaster01.pixelpark.com          ens161  ipv4.routing-rules      priority 11 from 93.188.109.6 table 400, priority 12 from 93.188.109.5 table 400, priority 13 to 93.188.109.5 table 400, priority 14 to 93.188.109.6 table 400
+prd-dnsmaster01.pixelpark.com          ens161  ipv4.routes             93.188.109.0/28 table=400, 0.0.0.0/0 93.188.109.1 table=400
+prd-dnsmaster01.pixelpark.com          ens161  ipv4.routing-rules      priority 11 from 93.188.109.5 table 400, priority 12 to 93.188.109.5 table 400, priority 13 from 93.188.109.6 table 400, priority 14 to 93.188.109.6 table 400
 prd-dnsmaster01.pixelpark.com          ens161  ipv6.method             ignore
 
 # prd-ns1.pixelpark.com
@@ -60,13 +60,13 @@ prd-ns1.pixelpark.com                       ens160  ipv6.method             ignore
 prd-ns1.pixelpark.com                  ens192  ipv4.method             manual
 prd-ns1.pixelpark.com                  ens192  ipv4.addresses          93.188.110.60/28
 prd-ns1.pixelpark.com                  ens192  ipv4.routes             93.188.110.48/28 table=100, 0.0.0.0/0 93.188.110.49 table=100
-prd-ns1.pixelpark.com                  ens192  ipv4.routing-rules      priority 5 from 93.188.110.48/28 table 100, priority 6 to 93.188.110.48/28 table 100
+prd-ns1.pixelpark.com                  ens192  ipv4.routing-rules      priority 5 from 93.188.110.60 table 100, priority 6 to 93.188.110.60 table 100
 prd-ns1.pixelpark.com                  ens192  ipv6.method             ignore
 
 prd-ns1.pixelpark.com                  ens224  ipv4.method             manual
 prd-ns1.pixelpark.com                  ens224  ipv4.addresses          93.188.104.87/25
 prd-ns1.pixelpark.com                  ens224  ipv4.routes             93.188.104.0/25 table=200, 0.0.0.0/0 93.188.104.1 table=200
-prd-ns1.pixelpark.com                  ens224  ipv4.routing-rules      priority 7 from 93.188.104.0/25 table 200, priority 8 to 93.188.104.0/25 table 200
+prd-ns1.pixelpark.com                  ens224  ipv4.routing-rules      priority 7 from 93.188.104.87 table 200, priority 8 to 93.188.104.87 table 200
 prd-ns1.pixelpark.com                  ens224  ipv6.method             ignore
 
 # prd-ns4.pixelpark.com
@@ -81,7 +81,70 @@ prd-ns4.pixelpark.com                        ens160  ipv6.method             ignore
 prd-ns4.pixelpark.com                  ens192  ipv4.method             manual
 prd-ns4.pixelpark.com                  ens192  ipv4.addresses          93.188.104.81/25
 prd-ns4.pixelpark.com                  ens192  ipv4.routes             93.188.104.0/25 table=100, 0.0.0.0/0 93.188.104.1 table=100
-prd-ns4.pixelpark.com                  ens192  ipv4.routing-rules      priority 5 from 93.188.104.0/25 table 100, priority 6 to 93.188.104.0/25 table 100
+prd-ns4.pixelpark.com                  ens192  ipv4.routing-rules      priority 5 from 93.188.104.81 table 100, priority 6 to 93.188.104.81 table 100
 prd-ns4.pixelpark.com                  ens192  ipv6.method             ignore
 
+# prd-resolv01.pixelpark.com
+prd-resolv01.pixelpark.com             ens160  ipv4.method             manual
+prd-resolv01.pixelpark.com             ens160  ipv4.addresses          217.66.51.54/24
+prd-resolv01.pixelpark.com             ens160  ipv4.gateway            217.66.51.1
+prd-resolv01.pixelpark.com             ens160  ipv4.dns                217.66.51.54,217.66.51.185,77.74.232.24
+prd-resolv01.pixelpark.com             ens160  ipv4.dns-search         pixelpark.com,pp-dns.com,pixelpark.net
+prd-resolv01.pixelpark.com             ens160  ipv4.dns-options        timeout:1,attempts:1
+prd-resolv01.pixelpark.com             ens160  ipv6.method             ignore
+
+prd-resolv01.pixelpark.com             ens192  ipv4.method             manual
+prd-resolv01.pixelpark.com             ens192  ipv4.addresses          77.74.232.18/28
+prd-resolv01.pixelpark.com             ens192  ipv4.routes             77.74.232.16/28 table=100, 0.0.0.0/0 77.74.232.17 table=100
+prd-resolv01.pixelpark.com             ens192  ipv4.routing-rules      priority 5 from 77.74.232.18 table 100, priority 6 to 77.74.232.18 table 100
+prd-resolv01.pixelpark.com             ens192  ipv6.method             ignore
+
+prd-resolv01.pixelpark.com             ens224  ipv4.method             manual
+prd-resolv01.pixelpark.com             ens224  ipv4.addresses          217.66.52.9/24,217.66.52.10/24,
+prd-resolv01.pixelpark.com             ens224  ipv4.routes             217.66.52.0/24 table=200, 0.0.0.0/0 217.66.52.1 table=200
+prd-resolv01.pixelpark.com             ens224  ipv4.routing-rules      priority 7 from 217.66.52.9 table 200, priority 8 to 217.66.52.9 table 200, priority 9 from 217.66.52.10 table 200, priority 10 from 217.66.52.10 table 200
+prd-resolv01.pixelpark.com             ens224  ipv6.method             ignore
+
+prd-resolv01.pixelpark.com             ens256  ipv4.method             manual
+prd-resolv01.pixelpark.com             ens256  ipv4.addresses          93.188.109.11/28
+prd-resolv01.pixelpark.com             ens256  ipv4.routes             93.188.109.0/28 table=300, 0.0.0.0/0 93.188.109.1 table=300
+prd-resolv01.pixelpark.com             ens256  ipv4.routing-rules      priority 11 from 93.188.109.11 table 300, priority 12 to 93.188.109.11 table 300
+prd-resolv01.pixelpark.com             ens256  ipv6.method             ignore
+
+# prd-resolv02.pixelpark.com
+prd-resolv02.pixelpark.com             ens160  ipv4.method             manual
+prd-resolv02.pixelpark.com             ens160  ipv4.addresses          217.66.51.185/24
+prd-resolv02.pixelpark.com             ens160  ipv4.gateway            217.66.51.1
+prd-resolv02.pixelpark.com             ens160  ipv4.dns                77.74.232.24,77.74.232.25,93.188.104.82
+prd-resolv02.pixelpark.com             ens160  ipv4.dns-search         pixelpark.com,pp-dns.com,pixelpark.net
+prd-resolv02.pixelpark.com             ens160  ipv4.dns-options        timeout:1,attempts:1
+prd-resolv02.pixelpark.com             ens160  ipv6.method             ignore
+
+prd-resolv02.pixelpark.com             ens192  ipv4.method             manual
+prd-resolv02.pixelpark.com             ens192  ipv4.addresses          93.188.109.12/28
+prd-resolv02.pixelpark.com             ens192  ipv4.routes             93.188.109.0/28 table=100, 0.0.0.0/0 93.188.109.1 table=100
+prd-resolv02.pixelpark.com             ens192  ipv4.routing-rules      priority 5 from 93.188.109.12 table 100, priority 6 to 93.188.109.12 table 100
+prd-resolv02.pixelpark.com             ens192  ipv6.method             ignore
+
+prd-resolv02.pixelpark.com             ens224  ipv4.method             manual
+prd-resolv02.pixelpark.com             ens224  ipv4.addresses          77.74.232.26/28
+prd-resolv02.pixelpark.com             ens224  ipv4.routes             77.74.232.16/28 table=200, 0.0.0.0/0 77.74.232.17 table=200
+prd-resolv02.pixelpark.com             ens224  ipv4.routing-rules      priority 7 from 77.74.232.26 table 200, priority 8 to 77.74.232.26 table 200
+prd-resolv02.pixelpark.com             ens224  ipv6.method             ignore
+
+# prd-resolv03.pixelpark.com
+prd-resolv03.pixelpark.com             ens160  ipv4.method             manual
+prd-resolv03.pixelpark.com             ens160  ipv4.addresses          93.188.104.82/25
+prd-resolv03.pixelpark.com             ens160  ipv4.gateway            93.188.104.1
+prd-resolv03.pixelpark.com             ens160  ipv4.dns                93.188.104.82,77.74.232.25,217.66.52.10
+prd-resolv03.pixelpark.com             ens160  ipv4.dns-search         pixelpark.com,pp-dns.com,pixelpark.net
+prd-resolv03.pixelpark.com             ens160  ipv4.dns-options        timeout:1,attempts:1
+prd-resolv03.pixelpark.com             ens160  ipv6.method             ignore
+
+prd-resolv03.pixelpark.com             ens192  ipv4.method             manual
+prd-resolv03.pixelpark.com             ens192  ipv4.addresses          93.188.109.13/28
+prd-resolv03.pixelpark.com             ens192  ipv4.routes             93.188.109.0/28 table=100, 0.0.0.0/0 93.188.109.1 table=100
+prd-resolv03.pixelpark.com             ens192  ipv4.routing-rules      priority 5 from 93.188.109.13 table 100, priority 6 to 93.188.109.13 table 100
+prd-resolv03.pixelpark.com             ens192  ipv6.method             ignore
+
 # vim: list