privatevoid.net/depot
1
1
Fork 0
Code Issues 25 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

hosts: remove hyprspace static address support, create vstub everywhere, route vstub through hyprspace

Browse source
This commit is contained in:
Max Headroom 2023-10-24 23:39:00 +02:00
parent 964b5dbe12
commit 4f9680966b
6 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hosts/VEGAS/default.nix
View file

@ -1,4 +1,4 @@
tools: { tools: rec {
ssh.enable = true; ssh.enable = true;
ssh.id = with tools.dns; { ssh.id = with tools.dns; {
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICz2nGA+Y4OxhMKsV6vKIns3hOoBkK557712h7FfWXcE"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICz2nGA+Y4OxhMKsV6vKIns3hOoBkK557712h7FfWXcE";
@ -19,10 +19,9 @@ tools: {
hyprspace = { hyprspace = {
enable = true; enable = true;
id = "QmYs4xNBby2fTs8RnzfXEk161KD4mftBfCiR8yXtgGPj4J"; id = "QmYs4xNBby2fTs8RnzfXEk161KD4mftBfCiR8yXtgGPj4J";
addr = "10.100.3.5";
listenPort = 995; listenPort = 995;
routes = [ routes = [
"10.1.0.1/32" "${interfaces.vstub.addr}/32"
"10.10.0.0/16" "10.10.0.0/16"
]; ];
}; };

10
hosts/checkmate/default.nix
View file

@ -1,4 +1,4 @@
tools: { tools: rec {
ssh.enable = true; ssh.enable = true;
ssh.id = with tools.dns; { ssh.id = with tools.dns; {
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINImnMfEzUBU5qiuu05DMPrddTGypOtr+cL1/yQN2GFn"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINImnMfEzUBU5qiuu05DMPrddTGypOtr+cL1/yQN2GFn";
@ -11,13 +11,19 @@ tools: {
addrPublic = "152.67.73.164"; addrPublic = "152.67.73.164";
link = "ens3"; link = "ens3";
}; };
vstub = {
addr = "10.1.0.32";
link = "vstub";
};
}; };
hyprspace = { hyprspace = {
enable = true; enable = true;
id = "12D3KooWL84sAtq1QTYwb7gVbhSNX5ZUfVt4kgYKz8pdif1zpGUh"; id = "12D3KooWL84sAtq1QTYwb7gVbhSNX5ZUfVt4kgYKz8pdif1zpGUh";
addr = "10.100.3.32";
listenPort = 995; listenPort = 995;
routes = [
"${interfaces.vstub.addr}/32"
];
}; };
enterprise = { enterprise = {

5
hosts/options/hour/hyprspace.nix
View file

@ -10,11 +10,6 @@ with lib;
type = types.str; type = types.str;
}; };
addr = mkOption {
description = "Hyprspace internal IP address.";
type = types.str;
};
routes = mkOption { routes = mkOption {
description = "Networks to export to Hyprspace."; description = "Networks to export to Hyprspace.";
type = with types; listOf str; type = with types; listOf str;

4
hosts/part.nix
View file

@ -29,13 +29,13 @@ in with tools.dns;
TITAN.hyprspace = { TITAN.hyprspace = {
enable = true; enable = true;
id = "QmfJ5Tv2z9jFv9Aocevyn6QqRcfm9eYQZhvYvmAVfACfuM"; id = "QmfJ5Tv2z9jFv9Aocevyn6QqRcfm9eYQZhvYvmAVfACfuM";
addr = "10.100.3.7"; # addr = "10.100.3.7";
}; };
jericho.hyprspace = { jericho.hyprspace = {
enable = true; enable = true;
id = "QmccBLgGP3HR36tTkwSYZX3KDv2EXb1MvYwGVs6PbpbHv9"; id = "QmccBLgGP3HR36tTkwSYZX3KDv2EXb1MvYwGVs6PbpbHv9";
addr = "10.100.3.13"; # addr = "10.100.3.13";
}; };
}; };
}; };

10
hosts/prophet/default.nix
View file

@ -1,4 +1,4 @@
tools: { tools: rec {
ssh.enable = true; ssh.enable = true;
ssh.id = with tools.dns; { ssh.id = with tools.dns; {
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUG/ubwo68tt2jMP5ia0Sa4mnkWtlKVN5n4Y50U2nTC"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUG/ubwo68tt2jMP5ia0Sa4mnkWtlKVN5n4Y50U2nTC";
@ -11,13 +11,19 @@ tools: {
addrPublic = "152.67.75.145"; addrPublic = "152.67.75.145";
link = "enp0s6"; link = "enp0s6";
}; };
vstub = {
addr = "10.1.0.9";
link = "vstub";
};
}; };
hyprspace = { hyprspace = {
enable = true; enable = true;
id = "QmbrAHuh4RYcyN9fWePCZMVmQjbaNXtyvrDCWz4VrchbXh"; id = "QmbrAHuh4RYcyN9fWePCZMVmQjbaNXtyvrDCWz4VrchbXh";
addr = "10.100.3.9";
listenPort = 995; listenPort = 995;
routes = [
"${interfaces.vstub.addr}/32"
];
}; };
enterprise = { enterprise = {

10
hosts/thunderskin/default.nix
View file

@ -1,4 +1,4 @@
tools: { tools: rec {
ssh.enable = true; ssh.enable = true;
ssh.id = with tools.dns; { ssh.id = with tools.dns; {
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGV8TbMvGXfAp9R2I9GdR7aLlGjxh2CW1pCZjQSB4TJp"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGV8TbMvGXfAp9R2I9GdR7aLlGjxh2CW1pCZjQSB4TJp";
@ -11,13 +11,19 @@ tools: {
addrPublic = "140.238.208.154"; addrPublic = "140.238.208.154";
link = "ens3"; link = "ens3";
}; };
vstub = {
addr = "10.1.0.4";
link = "vstub";
};
}; };
hyprspace = { hyprspace = {
enable = true; enable = true;
id = "12D3KooWB9AUPorFoACkWbphyargRBV9osJsYuQDumtQ85j7Aqmg"; id = "12D3KooWB9AUPorFoACkWbphyargRBV9osJsYuQDumtQ85j7Aqmg";
addr = "10.100.3.4";
listenPort = 995; listenPort = 995;
routes = [
"${interfaces.vstub.addr}/32"
];
}; };
enterprise = { enterprise = {