palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to fix the tinc setup

Browse source
This commit is contained in:
Ingolf Wagner 2024-06-05 13:33:33 +02:00
parent 4e8b131f32
commit 6249d7e869
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
12 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -411,6 +411,7 @@
name = "orbi"; name = "orbi";
#host = "orbi.bear"; #host = "orbi.bear";
host = "95.216.66.212"; host = "95.216.66.212";
#host = "10.100.0.1";
modules = [ modules = [
homeManagerModules homeManagerModules
stylixModules stylixModules

2
machines/cherry/facts/tinc.private.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = l6YmUlli5YM7hY1T+IJf8e59BeX6SW0mqT0JyVpyFtP l6YmUlli5YM7hY1T+IJf8e59BeX6SW0mqT0JyVpyFtP

2
machines/cherry/facts/tinc.secret.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = VEIrTM0ZovSd5f3N+QMWkJZhXBpjy9IBGoNEmEXIu5J VEIrTM0ZovSd5f3N+QMWkJZhXBpjy9IBGoNEmEXIu5J

2
machines/chungus/facts/tinc.private.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = d5911IzQWbEVIwDFhtUsQZ4mjXHcej536stHbJmqesF d5911IzQWbEVIwDFhtUsQZ4mjXHcej536stHbJmqesF

2
machines/chungus/facts/tinc.retiolum.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = vyYRAnWEo70ZtxSj+Ef92yT7CxihDgjsffrW34oKZ8H vyYRAnWEo70ZtxSj+Ef92yT7CxihDgjsffrW34oKZ8H

2
machines/cream/facts/tinc.private.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = +c/UHJuWi8QiodfiUOFjuurWcQMLfH503gYEeneIbrN +c/UHJuWi8QiodfiUOFjuurWcQMLfH503gYEeneIbrN

2
machines/cream/facts/tinc.retiolum.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = Y6xv3l6hjLp3x4fqPR4jF1syP51TQ4M95X/tL1m8K2B Y6xv3l6hjLp3x4fqPR4jF1syP51TQ4M95X/tL1m8K2B

2
machines/cream/facts/tinc.secret.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = UYlQQNY4CTw8UM1EGC534oZkPgiSPG7lI+mqXWgq6AH UYlQQNY4CTw8UM1EGC534oZkPgiSPG7lI+mqXWgq6AH

2
machines/orbi/facts/tinc.private.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = 8T8Wy75d86wlNQ+gNfd6VQDUPHbb/T5FyLiZTIYyrhJ 8T8Wy75d86wlNQ+gNfd6VQDUPHbb/T5FyLiZTIYyrhJ

2
machines/orbi/facts/tinc.secret.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = Rux0npWBaeu49NoJ9d70+EpB6jfuB9NnTx26DreESSP Rux0npWBaeu49NoJ9d70+EpB6jfuB9NnTx26DreESSP

2
machines/sternchen/facts/tinc.secret.ed25519_key.pub
View file

@ -1 +1 @@
Ed25519PublicKey = tuZNNw0EDFQLZKxVUbz41T4xnyZ4pjPJb8MmeGMXaoJ tuZNNw0EDFQLZKxVUbz41T4xnyZ4pjPJb8MmeGMXaoJ

33
nixos/components/network/tinc/private.nix
View file

@ -55,6 +55,8 @@ let
"paperless.chungus" = hosts.chungus; "paperless.chungus" = hosts.chungus;
}; };
network = "private"; network = "private";
Ed25519PublicKey = machine: (builtins.readFile "${config.clanCore.clanDir}/machines/${machine}/facts/tinc.private.ed25519_key.pub");
Ed25519PublicKeyFile = machine: "${config.clanCore.clanDir}/machines/${machine}/facts/tinc.private.ed25519_key.pub";
in in
{ {
networking.firewall.trustedInterfaces = [ "tinc.${network}" ]; networking.firewall.trustedInterfaces = [ "tinc.${network}" ];
@ -73,39 +75,26 @@ in
subnets = [{ address = hosts.mobi; }]; subnets = [{ address = hosts.mobi; }];
settings.Ed25519PublicKey = "X5sp3YYevVNUrzYvi+HZ2iW5WbO0bIb58jR4jZFH6MB"; settings.Ed25519PublicKey = "X5sp3YYevVNUrzYvi+HZ2iW5WbO0bIb58jR4jZFH6MB";
}; };
cream = {
subnets = [{ address = hosts.cream; }];
settings.Ed25519PublicKey = "Y/YRA90mAlNEmdhUWlUTHjjsco6d6hlvW11sPtarIdL";
};
cherry = {
subnets = [{ address = hosts.cherry; }];
settings.Ed25519PublicKey = "BsPIrZjbzn0aryC0HO3OXSb4oFCMmzNDmMDQmxUXUuC";
};
sterni = {
subnets = [{ address = hosts.sterni; }];
settings.Ed25519PublicKey = "r6mRDc814z2YtyG9ev/XXV2SgquqWR8n53V13xNXb7O";
};
bobi = { bobi = {
subnets = [{ address = hosts.bobi; }]; subnets = [{ address = hosts.bobi; }];
settings.Ed25519PublicKey = "jwvNd4oAgz2cWEI74VTVYU1qgPWq823/a0iEDqJ8KMD"; settings.Ed25519PublicKey = "jwvNd4oAgz2cWEI74VTVYU1qgPWq823/a0iEDqJ8KMD";
}; };
pepe = { cream = {
subnets = [{ address = hosts.pepe; }]; subnets = [{ address = hosts.cream; }];
settings.Ed25519PublicKey = "LnE+w6ZfNCky4Kad3TBxpFKRJ2PJshkSpW6mC3pcsPI"; settings.Ed25519PublicKey = Ed25519PublicKey "cream";
};
cherry = {
subnets = [{ address = hosts.cherry; }];
settings.Ed25519PublicKey = Ed25519PublicKey "cherry";
}; };
chungus = { chungus = {
subnets = [{ address = hosts.chungus; }]; subnets = [{ address = hosts.chungus; }];
settings.Ed25519PublicKey = "mJP+zzYGv42KItpSf3lMkr3dwa5xW3n3hi0W2Z75jfJ"; settings.Ed25519PublicKey = Ed25519PublicKey "chungus";
};
robi = {
addresses = [{ address = "144.76.13.147"; }];
subnets = [{ address = hosts.robi; }];
settings.Ed25519PublicKey = "bZUbSdME4fwudNVbUoNO7PpoOS2xALsyTs81F260KbL";
}; };
orbi = { orbi = {
addresses = [{ address = "95.216.66.212"; }]; addresses = [{ address = "95.216.66.212"; }];
subnets = [{ address = hosts.orbi; }]; subnets = [{ address = hosts.orbi; }];
settings.Ed25519PublicKey = "/1OE8xsnRT6egxd/+iH9TE+tzlwiUJeNsGFIIWyc70A"; settings.Ed25519PublicKey = Ed25519PublicKey "orbi";
}; };
}; };
}; };