From 7560cc6b35204fa1c34653e39028f5cfe8d4abe4 Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Sat, 24 Nov 2018 21:47:43 +0100 Subject: space_server: networkd: smarter set difference --- roles/space_server/files/network/10-lan.link | 5 ----- roles/space_server/files/network/10-lan.network | 19 ------------------- roles/space_server/files/network/10-lan10.netdev | 6 ------ roles/space_server/files/network/10-lan10.network | 12 ------------ roles/space_server/files/network/10-lan11.netdev | 6 ------ roles/space_server/files/network/10-lan11.network | 19 ------------------- roles/space_server/files/network/10-lan12.netdev | 6 ------ roles/space_server/files/network/10-lan12.network | 19 ------------------- roles/space_server/files/network/10-lan13.netdev | 6 ------ roles/space_server/files/network/10-lan13.network | 19 ------------------- roles/space_server/files/network/10-lan14.netdev | 6 ------ roles/space_server/files/network/10-lan14.network | 19 ------------------- roles/space_server/files/network/10-lan15.netdev | 6 ------ roles/space_server/files/network/10-lan15.network | 14 -------------- roles/space_server/files/network/10-lan20.netdev | 6 ------ roles/space_server/files/network/10-lan20.network | 23 ----------------------- roles/space_server/files/network/10-lo.network | 14 -------------- roles/space_server/files/network/10-mgt.link | 5 ----- roles/space_server/files/network/10-mgt.network | 19 ------------------- roles/space_server/files/network/10-wan.link | 5 ----- roles/space_server/files/network/10-wan.network | 21 --------------------- 21 files changed, 255 deletions(-) delete mode 100644 roles/space_server/files/network/10-lan.link delete mode 100644 roles/space_server/files/network/10-lan.network delete mode 100644 roles/space_server/files/network/10-lan10.netdev delete mode 100644 roles/space_server/files/network/10-lan10.network delete mode 100644 roles/space_server/files/network/10-lan11.netdev delete mode 100644 roles/space_server/files/network/10-lan11.network delete mode 100644 roles/space_server/files/network/10-lan12.netdev delete mode 100644 roles/space_server/files/network/10-lan12.network delete mode 100644 roles/space_server/files/network/10-lan13.netdev delete mode 100644 roles/space_server/files/network/10-lan13.network delete mode 100644 roles/space_server/files/network/10-lan14.netdev delete mode 100644 roles/space_server/files/network/10-lan14.network delete mode 100644 roles/space_server/files/network/10-lan15.netdev delete mode 100644 roles/space_server/files/network/10-lan15.network delete mode 100644 roles/space_server/files/network/10-lan20.netdev delete mode 100644 roles/space_server/files/network/10-lan20.network delete mode 100644 roles/space_server/files/network/10-lo.network delete mode 100644 roles/space_server/files/network/10-mgt.link delete mode 100644 roles/space_server/files/network/10-mgt.network delete mode 100644 roles/space_server/files/network/10-wan.link delete mode 100644 roles/space_server/files/network/10-wan.network (limited to 'roles/space_server/files/network') diff --git a/roles/space_server/files/network/10-lan.link b/roles/space_server/files/network/10-lan.link deleted file mode 100644 index 996917e..0000000 --- a/roles/space_server/files/network/10-lan.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:02:00.0 - -[Link] -Name=lan diff --git a/roles/space_server/files/network/10-lan.network b/roles/space_server/files/network/10-lan.network deleted file mode 100644 index 08b85aa..0000000 --- a/roles/space_server/files/network/10-lan.network +++ /dev/null @@ -1,19 +0,0 @@ -[Match] -Name=lan - -#[Link] -#ARP=no - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -LLMNR=no -MulticastDNS=no -VLAN=lan10 -VLAN=lan11 -VLAN=lan12 -VLAN=lan13 -VLAN=lan14 -VLAN=lan15 -VLAN=lan20 diff --git a/roles/space_server/files/network/10-lan10.netdev b/roles/space_server/files/network/10-lan10.netdev deleted file mode 100644 index 655859d..0000000 --- a/roles/space_server/files/network/10-lan10.netdev +++ /dev/null @@ -1,6 +0,0 @@ -[NetDev] -Name=lan10 -Kind=vlan - -[VLAN] -Id=10 diff --git a/roles/space_server/files/network/10-lan10.network b/roles/space_server/files/network/10-lan10.network deleted file mode 100644 index 18931e0..0000000 --- a/roles/space_server/files/network/10-lan10.network +++ /dev/null @@ -1,12 +0,0 @@ -[Match] -Name=lan10 - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -Address=10.42.0.1/24 -IPForward=yes -LLMNR=yes -MulticastDNS=yes -LLDP=yes diff --git a/roles/space_server/files/network/10-lan11.netdev b/roles/space_server/files/network/10-lan11.netdev deleted file mode 100644 index b99b50b..0000000 --- a/roles/space_server/files/network/10-lan11.netdev +++ /dev/null @@ -1,6 +0,0 @@ -[NetDev] -Name=lan11 -Kind=vlan - -[VLAN] -Id=11 diff --git a/roles/space_server/files/network/10-lan11.network b/roles/space_server/files/network/10-lan11.network deleted file mode 100644 index 88d714f..0000000 --- a/roles/space_server/files/network/10-lan11.network +++ /dev/null @@ -1,19 +0,0 @@ -[Match] -Name=lan11 - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -Address=10.42.1.1/24 -#Address=2a01:4262:1ab:b::1/64 -Address=fe80::1/64 -IPForward=yes -LLMNR=yes -MulticastDNS=yes -LLDP=yes -EmitLLDP=yes - -[Route] -Destination=2a01:4262:1ab:b::/64 -PreferredSource=2a01:4262:1ab:: diff --git a/roles/space_server/files/network/10-lan12.netdev b/roles/space_server/files/network/10-lan12.netdev deleted file mode 100644 index 7229fa1..0000000 --- a/roles/space_server/files/network/10-lan12.netdev +++ /dev/null @@ -1,6 +0,0 @@ -[NetDev] -Name=lan12 -Kind=vlan - -[VLAN] -Id=12 diff --git a/roles/space_server/files/network/10-lan12.network b/roles/space_server/files/network/10-lan12.network deleted file mode 100644 index 7f48f5b..0000000 --- a/roles/space_server/files/network/10-lan12.network +++ /dev/null @@ -1,19 +0,0 @@ -[Match] -Name=lan12 - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -Address=10.42.2.1/24 -#Address=2a01:4262:1ab:c::1/64 -Address=fe80::1/64 -IPForward=yes -LLMNR=yes -MulticastDNS=yes -LLDP=yes -EmitLLDP=yes - -[Route] -Destination=2a01:4262:1ab:c::/64 -PreferredSource=2a01:4262:1ab:: diff --git a/roles/space_server/files/network/10-lan13.netdev b/roles/space_server/files/network/10-lan13.netdev deleted file mode 100644 index ab05488..0000000 --- a/roles/space_server/files/network/10-lan13.netdev +++ /dev/null @@ -1,6 +0,0 @@ -[NetDev] -Name=lan13 -Kind=vlan - -[VLAN] -Id=13 diff --git a/roles/space_server/files/network/10-lan13.network b/roles/space_server/files/network/10-lan13.network deleted file mode 100644 index 81e3911..0000000 --- a/roles/space_server/files/network/10-lan13.network +++ /dev/null @@ -1,19 +0,0 @@ -[Match] -Name=lan13 - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -Address=10.42.3.1/24 -#Address=2a01:4262:1ab:d::1/64 -Address=fe80::1/64 -IPForward=yes -LLMNR=yes -MulticastDNS=yes -LLDP=yes -EmitLLDP=yes - -[Route] -Destination=2a01:4262:1ab:d::/64 -PreferredSource=2a01:4262:1ab:: diff --git a/roles/space_server/files/network/10-lan14.netdev b/roles/space_server/files/network/10-lan14.netdev deleted file mode 100644 index 1956a88..0000000 --- a/roles/space_server/files/network/10-lan14.netdev +++ /dev/null @@ -1,6 +0,0 @@ -[NetDev] -Name=lan14 -Kind=vlan - -[VLAN] -Id=14 diff --git a/roles/space_server/files/network/10-lan14.network b/roles/space_server/files/network/10-lan14.network deleted file mode 100644 index 5b40bbf..0000000 --- a/roles/space_server/files/network/10-lan14.network +++ /dev/null @@ -1,19 +0,0 @@ -[Match] -Name=lan14 - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -Address=10.42.4.1/24 -#Address=2a01:4262:1ab:e::1/64 -Address=fe80::1/64 -IPForward=yes -LLMNR=yes -MulticastDNS=yes -LLDP=yes -EmitLLDP=yes - -[Route] -Destination=2a01:4262:1ab:e::/64 -PreferredSource=2a01:4262:1ab:: diff --git a/roles/space_server/files/network/10-lan15.netdev b/roles/space_server/files/network/10-lan15.netdev deleted file mode 100644 index c31a650..0000000 --- a/roles/space_server/files/network/10-lan15.netdev +++ /dev/null @@ -1,6 +0,0 @@ -[NetDev] -Name=lan15 -Kind=vlan - -[VLAN] -Id=15 diff --git a/roles/space_server/files/network/10-lan15.network b/roles/space_server/files/network/10-lan15.network deleted file mode 100644 index e3c99dd..0000000 --- a/roles/space_server/files/network/10-lan15.network +++ /dev/null @@ -1,14 +0,0 @@ -[Match] -Name=lan15 - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -Address=2a01:4262:1ab:f::1/64 -Address=fe80::1/64 -IPForward=ipv6 -LLMNR=yes -MulticastDNS=yes -LLDP=yes -EmitLLDP=yes diff --git a/roles/space_server/files/network/10-lan20.netdev b/roles/space_server/files/network/10-lan20.netdev deleted file mode 100644 index 2b2e0d8..0000000 --- a/roles/space_server/files/network/10-lan20.netdev +++ /dev/null @@ -1,6 +0,0 @@ -[NetDev] -Name=lan20 -Kind=vlan - -[VLAN] -Id=20 diff --git a/roles/space_server/files/network/10-lan20.network b/roles/space_server/files/network/10-lan20.network deleted file mode 100644 index 06b1ff1..0000000 --- a/roles/space_server/files/network/10-lan20.network +++ /dev/null @@ -1,23 +0,0 @@ -[Match] -Name=lan20 - -[Network] -DHCP=no -IPv6AcceptRA=no -LinkLocalAddressing=no -Address=185.38.175.65/26 -Address=2a01:4262:1ab:20::1/64 -Address=fe80::1/64 -IPForward=yes -LLMNR=no -MulticastDNS=no -LLDP=yes -EmitLLDP=no - -[Route] -Destination=2a01:4262:1ab::cafe/128 -Gateway=2a01:4262:1ab:20::5 - -[Route] -Destination=2a01:4262:1ab::db/128 -Gateway=2a01:4262:1ab:20::6 diff --git a/roles/space_server/files/network/10-lo.network b/roles/space_server/files/network/10-lo.network deleted file mode 100644 index 9b89210..0000000 --- a/roles/space_server/files/network/10-lo.network +++ /dev/null @@ -1,14 +0,0 @@ -[Match] -Name=lo - -[Network] -Address=185.38.175.0/32 -Address=2a01:4262:1ab::/128 - -[Route] -Type=unreachable -Destination=185.38.175.0/24 - -[Route] -Type=unreachable -Destination=2a01:4262:1ab::/48 diff --git a/roles/space_server/files/network/10-mgt.link b/roles/space_server/files/network/10-mgt.link deleted file mode 100644 index 715f409..0000000 --- a/roles/space_server/files/network/10-mgt.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:03:00.0 - -[Link] -Name=mgt diff --git a/roles/space_server/files/network/10-mgt.network b/roles/space_server/files/network/10-mgt.network deleted file mode 100644 index 9da626e..0000000 --- a/roles/space_server/files/network/10-mgt.network +++ /dev/null @@ -1,19 +0,0 @@ -[Match] -Name=mgt - -[Network] -DHCP=no -IPv6AcceptRA=no -Address=192.168.112.1/24 -#IPForward=ipv4 -DHCPServer=yes -LLMNR=yes -MulticastDNS=yes -LLDP=yes -EmitLLDP=yes - -[DHCPServer] -DNS=192.168.112.1 -EmitDNS=yes -EmitNTP=no -EmitTimezone=yes diff --git a/roles/space_server/files/network/10-wan.link b/roles/space_server/files/network/10-wan.link deleted file mode 100644 index 47a7270..0000000 --- a/roles/space_server/files/network/10-wan.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -Path=pci-0000:01:00.0 - -[Link] -Name=wan diff --git a/roles/space_server/files/network/10-wan.network b/roles/space_server/files/network/10-wan.network deleted file mode 100644 index 1d14dee..0000000 --- a/roles/space_server/files/network/10-wan.network +++ /dev/null @@ -1,21 +0,0 @@ -[Match] -Name=wan - -[Network] -DHCP=no -IPv6AcceptRA=no -Address=193.106.167.46/29 -Address=2a03:5440:1:2935:1ab::3/120 -IPForward=yes -LLMNR=no -MulticastDNS=no -LLDP=yes -EmitLLDP=no - -[Route] -Gateway=193.106.167.42 -Metric=1024 - -[Route] -Gateway=2a03:5440:1:2935:1ab::2 -Metric=1024 -- cgit v1.2.1