clerie/nixfiles
1
0
Fork 0
Code

Add IPv4 Tunnel Support

Browse Source
This commit is contained in:
clerie 2020-12-16 11:15:59 +01:00
parent 3c2de6bc17
commit 21f2235964
2 changed files with 74 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hosts/nonat/configuration.nix
View File

@ -52,6 +52,7 @@
networking.wireguard.enable = true; networking.wireguard.enable = true;
networking.wireguard.interfaces = { networking.wireguard.interfaces = {
wg-porter = { wg-porter = {
ips = [ "fe80::1337:2/64" "169.254.137.2/24" ];
peers = [ { peers = [ {
allowedIPs = [ "0.0.0.0/0" "::/0" ]; allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "porter.net.clerie.de:51337"; endpoint = "porter.net.clerie.de:51337";
@ -60,7 +61,7 @@
listenPort = 51337; listenPort = 51337;
allowedIPsAsRoutes = false; allowedIPsAsRoutes = false;
privateKeyFile = "/var/src/secrets/wireguard/wg-porter"; privateKeyFile = "/var/src/secrets/wireguard/wg-porter";
} // (import ../../lib/link-local-wireguard.nix {}).llIPv6 "fe80::1337:2" "fe80::1337:1" "wg-porter"; };
}; };
networking.firewall.allowedUDPPorts = [ 51337 ]; networking.firewall.allowedUDPPorts = [ 51337 ];
@ -70,15 +71,19 @@
router id ${ (lib.head config.networking.interfaces.lo.ipv4.addresses).address }; router id ${ (lib.head config.networking.interfaces.lo.ipv4.addresses).address };
ipv6 table ospf6; ipv6 table ospf6;
ipv4 table ospf4;
protocol direct { protocol direct {
interface "lo"; interface "lo";
ipv6 { ipv6 {
table ospf6; table ospf6;
}; };
ipv4 {
table ospf4;
};
} }
protocol kernel { protocol kernel kernel_6 {
ipv6 { ipv6 {
table ospf6; table ospf6;
export filter { export filter {
@ -89,7 +94,18 @@
}; };
} }
protocol ospf v3 { protocol kernel kernel_4 {
ipv4 {
table ospf4;
export filter {
krt_prefsrc=10.152.103.1;
accept;
};
import none;
};
}
protocol ospf v3 ospf_6 {
ipv6 { ipv6 {
table ospf6; table ospf6;
import all; import all;
@ -103,6 +119,20 @@
}; };
} }
protocol ospf v3 ospf_4 {
ipv4 {
table ospf4;
import all;
export all;
};
area 0 {
interface "wg-porter" {
cost 80;
type pointopoint;
};
};
}
protocol device { protocol device {
scan time 10; scan time 10;
} }

44
hosts/porter/configuration.nix
View File

@ -34,6 +34,7 @@
networking.wireguard.enable = true; networking.wireguard.enable = true;
networking.wireguard.interfaces = { networking.wireguard.interfaces = {
wg-nonat = { wg-nonat = {
ips = [ "fe80::1337:1/64" "169.254.137.1/24" ];
peers = [ { peers = [ {
allowedIPs = [ "0.0.0.0/0" "::/0" ]; allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "nonat.net.clerie.de:51337"; endpoint = "nonat.net.clerie.de:51337";
@ -42,7 +43,7 @@
listenPort = 51337; listenPort = 51337;
allowedIPsAsRoutes = false; allowedIPsAsRoutes = false;
privateKeyFile = "/var/src/secrets/wireguard/wg-nonat"; privateKeyFile = "/var/src/secrets/wireguard/wg-nonat";
} // (import ../../lib/link-local-wireguard.nix {}).llIPv6 "fe80::1337:1" "fe80::1337:2" "wg-nonat"; };
}; };
networking.firewall.allowedUDPPorts = [ 51337 ]; networking.firewall.allowedUDPPorts = [ 51337 ];
@ -52,15 +53,19 @@
router id ${ (lib.head config.networking.interfaces.lo.ipv4.addresses).address }; router id ${ (lib.head config.networking.interfaces.lo.ipv4.addresses).address };
ipv6 table ospf6; ipv6 table ospf6;
ipv4 table ospf4;
protocol direct { protocol direct {
interface "lo"; interface "lo";
ipv6 { ipv6 {
table ospf6; table ospf6;
}; };
ipv4 {
table ospf4;
};
} }
protocol kernel { protocol kernel kernel_6 {
ipv6 { ipv6 {
table ospf6; table ospf6;
export filter { export filter {
@ -71,7 +76,18 @@
}; };
} }
protocol ospf v3 { protocol kernel kernel_4 {
ipv4 {
table ospf4;
export filter {
krt_prefsrc=10.152.102.1;
accept;
};
import none;
};
}
protocol ospf v3 ospf_6 {
ipv6 { ipv6 {
table ospf6; table ospf6;
import all; import all;
@ -85,6 +101,20 @@
}; };
} }
protocol ospf v3 ospf_4 {
ipv4 {
table ospf4;
import all;
export all;
};
area 0 {
interface "wg-nonat" {
cost 80;
type pointopoint;
};
};
}
protocol device { protocol device {
scan time 10; scan time 10;
} }