1
0

Compare commits

..

10 Commits

2 changed files with 158 additions and 20 deletions

6
flake.lock generated
View File

@@ -650,11 +650,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1764667669, "lastModified": 1764950072,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "418468ac9527e799809c900eda37cbff999199b6", "rev": "f61125a668a320878494449750330ca58b78c557",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -46,6 +46,25 @@
# dn42-router-general-wireguard-key public key: # dn42-router-general-wireguard-key public key:
# r38qvXqu26x4f6yUGxg44Ji4db/g2HK7RZwG7Boh+38= # r38qvXqu26x4f6yUGxg44Ji4db/g2HK7RZwG7Boh+38=
# darkpoint
wg0150 = {
ips = [
"fe80::2574/128"
];
postSetup = ''
ip addr replace dev wg0150 fe80::2574/128 peer fe80::150/128
'';
listenPort = 50150;
allowedIPsAsRoutes = false;
peers = [
{
allowedIPs = [ "fe80::/10" "fd00::/8" ];
endpoint = "fra.darkpoint.xyz:22574";
publicKey = "nfoxTtmJdBdxNR3TmfVLG13KA5E+ZtU+uIGCegxrxxw=";
}
];
privateKeyFile = config.sops.secrets.dn42-router-general-wireguard-key.path;
};
# e1mo # e1mo
wg0565 = { wg0565 = {
ips = [ ips = [
@@ -164,25 +183,25 @@
]; ];
privateKeyFile = config.sops.secrets.wg1280.path; privateKeyFile = config.sops.secrets.wg1280.path;
}; };
# lutoma # c4tg1rl5
wg4719 = { # https://catgirls.systems/peering/
wg1411 = {
ips = [ ips = [
#"fe80::1/128" "fe80::2574/128"
# peer fe80::acab/128
]; ];
postSetup = '' postSetup = ''
ip addr add dev wg4719 fe80::1/128 peer fe80::acab/128 ip addr replace dev wg1411 fe80::2574/128 peer fe80::1411/128
''; '';
listenPort = 54719; listenPort = 51411;
allowedIPsAsRoutes = false; allowedIPsAsRoutes = false;
peers = [ peers = [
{ #{
allowedIPs = [ "fe80::/10" "fd00::/8" ]; # allowedIPs = [ "fe80::/10" "fd00::/8" ];
endpoint = "[2603:c020:8001:ed42::42]:42546"; # endpoint = "";
publicKey = "MkVyCgIq0BOStFIu2/Wl91ofFuRvnG3ZqTWFfVs/VlQ="; # publicKey = "";
} #}
]; ];
privateKeyFile = config.sops.secrets.wg4719.path; privateKeyFile = config.sops.secrets.dn42-router-general-wireguard-key.path;
}; };
# zaphyra # zaphyra
wg1718 = { wg1718 = {
@@ -204,17 +223,101 @@
]; ];
privateKeyFile = config.sops.secrets.wg1718.path; privateKeyFile = config.sops.secrets.wg1718.path;
}; };
# iedon
# https://iedon.net/
wg2189 = {
ips = [
"fe80::2574/128"
];
postSetup = ''
ip addr replace dev wg2189 fe80::2574/128 peer fe80::2189:e9/128
'';
listenPort = 52189;
allowedIPsAsRoutes = false;
peers = [
{
allowedIPs = [ "fe80::/10" "fd00::/8" ];
endpoint = "de-fra.dn42.iedon.net:42463";
publicKey = "FHp0OR4UpAS8/Ra0FUNffTk18soUYCa6NcvZdOgxY0k=";
}
];
privateKeyFile = config.sops.secrets.dn42-router-general-wireguard-key.path;
};
# jona / cryne
wg3402 = {
ips = [
"fe80::2574/128"
];
postSetup = ''
ip addr replace dev wg3402 fe80::2574/128 peer fe80::3402/128
'';
listenPort = 53402;
allowedIPsAsRoutes = false;
peers = [
{
allowedIPs = [ "fe80::/10" "fd00::/8" ];
endpoint = "dn42.cryne.me:42574";
publicKey = "YsKInIp90is8ysnQDHGoKnz2CqlTMWMZDmQ+vwvN2C0=";
}
];
privateKeyFile = config.sops.secrets.dn42-router-general-wireguard-key.path;
};
# lutoma
wg4719 = {
ips = [
#"fe80::1/128"
# peer fe80::acab/128
];
postSetup = ''
ip addr add dev wg4719 fe80::1/128 peer fe80::acab/128
'';
listenPort = 54719;
allowedIPsAsRoutes = false;
peers = [
{
allowedIPs = [ "fe80::/10" "fd00::/8" ];
endpoint = "[2603:c020:8001:ed42::42]:42546";
publicKey = "MkVyCgIq0BOStFIu2/Wl91ofFuRvnG3ZqTWFfVs/VlQ=";
}
];
privateKeyFile = config.sops.secrets.wg4719.path;
};
# tbspace
wg6190 = {
ips = [
"fe80::2574/128"
];
postSetup = ''
ip addr replace dev wg6190 fe80::2574/128 peer fe80::1299:e/128
'';
listenPort = 56190;
allowedIPsAsRoutes = false;
peers = [
{
allowedIPs = [ "fe80::/10" "fd00::/8" ];
endpoint = "dn42.tbspace.de:49168";
publicKey = "skvyDl81J8Zu3Ziem+7JKeU4UYLhhWt7gWelg8nEbzQ=";
}
];
privateKeyFile = config.sops.secrets.dn42-router-general-wireguard-key.path;
};
}; };
networking.firewall.allowedUDPPorts = [ networking.firewall.allowedUDPPorts = [
50150 # wg0150
50565 # wg0565 50565 # wg0565
50663 # wg0663
51240 # wg1240 51240 # wg1240
51241 # wg1241 51241 # wg1241
51271 # wg1271 51271 # wg1271
51272 # wg1272 51272 # wg1272
51280 # wg1280 51280 # wg1280
54719 # wg4719 51411 # wg1411
51718 # wg1718 51718 # wg1718
52189 # wg2189
53402 # wg3402
54719 # wg4719
56190 # wg6190
]; ];
profiles.clerie.dn42-router = { profiles.clerie.dn42-router = {
@@ -238,6 +341,13 @@
]; ];
wireguardPeers = [ wireguardPeers = [
{
peerName = "peer_0150";
remoteAddress = "fe80::150";
interfaceName = "wg0150";
remoteAsn = "4242420150";
localAddress = "fe80::2574";
}
{ {
peerName = "peer_0565"; peerName = "peer_0565";
remoteAddress = "fe80::565"; remoteAddress = "fe80::565";
@@ -280,6 +390,34 @@
remoteAsn = "4242421280"; remoteAsn = "4242421280";
localAddress = "fde3:4c0d:2836:ff00::21"; localAddress = "fde3:4c0d:2836:ff00::21";
} }
{
peerName = "peer_1411_de_fsn";
remoteAddress = "fe80::1411";
interfaceName = "wg1411";
remoteAsn = "4242421411";
localAddress = "fe80::2574";
}
{
peerName = "peer_1718";
remoteAddress = "fe80::6b61";
interfaceName = "wg1718";
remoteAsn = "4242421718";
localAddress = "fe80::2574";
}
{
peerName = "peer_2189_de_fra";
remoteAddress = "fe80::2189:e9";
interfaceName = "wg2189";
remoteAsn = "4242422189";
localAddress = "fe80::2574";
}
{
peerName = "peer_3402";
remoteAddress = "fe80::3402";
interfaceName = "wg3402";
remoteAsn = "4242423402";
localAddress = "fe80::2574";
}
{ {
peerName = "peer_4719"; peerName = "peer_4719";
remoteAddress = "fe80::acab"; remoteAddress = "fe80::acab";
@@ -288,10 +426,10 @@
localAddress = "fe80::1"; localAddress = "fe80::1";
} }
{ {
peerName = "peer_1718"; peerName = "peer_6190";
remoteAddress = "fe80::6b61"; remoteAddress = "fe80::1299:e";
interfaceName = "wg1718"; interfaceName = "wg6190";
remoteAsn = "4242421718"; remoteAsn = "76190";
localAddress = "fe80::2574"; localAddress = "fe80::2574";
} }
]; ];