c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Move nncp container into c3d2 vlan

This commit is contained in:
Ehmry - 2022-01-18 21:44:17 +01:00
parent c61915a9a2
commit 2b1e2bdb36
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/nncp-relays.nix
View File

@ -1,5 +1,3 @@
{ config, ... }:
{ {
blackbox = { blackbox = {
addrs.yggdrasil = "[20b:c3d2:4aa5:62bf:4f15:ed96:fcae:7a7]:5400"; addrs.yggdrasil = "[20b:c3d2:4aa5:62bf:4f15:ed96:fcae:7a7]:5400";
@ -9,7 +7,7 @@
signpub = "QYJPF3SRTJGPZAGDHAFLWPMCTBHZOKTLATYXVX6WCUSNVGBECYHA"; signpub = "QYJPF3SRTJGPZAGDHAFLWPMCTBHZOKTLATYXVX6WCUSNVGBECYHA";
}; };
c3d2 = { c3d2 = {
addrs.clearnet = "[${config.c3d2.hosts.nncp.ip6}]:5400"; addrs.yggdrasil = "[30c:c3d2:b946:76d0:dcec:9aff:fe6f:3f63]:5400";
exchpub = "MUZ3GI6GWEEIDQSUR6YGA3KNYERUFHIHLG24OG54QJJU2X5UGAJQ"; exchpub = "MUZ3GI6GWEEIDQSUR6YGA3KNYERUFHIHLG24OG54QJJU2X5UGAJQ";
id = "NGQLTVQVIRZEPXB6OEOZIEGZ4SQQ2P25HBXFPEX5C57VEKQDF4BA"; id = "NGQLTVQVIRZEPXB6OEOZIEGZ4SQQ2P25HBXFPEX5C57VEKQDF4BA";
noisepub = "YLJJGNQWNO3CGTBPROUUKVTSU3TFWHTBWREXMBBPMGMPJBWXAINA"; noisepub = "YLJJGNQWNO3CGTBPROUUKVTSU3TFWHTBWREXMBBPMGMPJBWXAINA";

4
flake.nix
View File

@ -510,7 +510,7 @@
nixosModule = self.nixosModules.c3d2; nixosModule = self.nixosModules.c3d2;
nixosModules = { nixosModules = {
c3d2 = { config, ... }: { c3d2 = {
imports = [ imports = [
sops-nix.nixosModule sops-nix.nixosModule
./modules/c3d2.nix ./modules/c3d2.nix
@ -518,7 +518,7 @@
]; ];
c3d2.hosts = hostRegistry.hosts; c3d2.hosts = hostRegistry.hosts;
c3d2.users = import ./users.nix; c3d2.users = import ./users.nix;
c3d2.nncp.neigh = import ./config/nncp-relays.nix { inherit config; }; c3d2.nncp.neigh = import ./config/nncp-relays.nix;
}; };
nncp = ./modules/nncp.nix; nncp = ./modules/nncp.nix;
plume = { plume = {

2
host-registry.nix
View File

@ -56,7 +56,7 @@
nix-build.ip4 = "172.22.99.156"; nix-build.ip4 = "172.22.99.156";
nncp = { nncp = {
ip6 = "2a00:8180:2c00:282:dcec:9aff:fe6f:3f63"; ip6 = "2a00:8180:2c00:223:dcec:9aff:fe6f:3f63";
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQhxaeElmxO1UgaI/+qr+g13OFeY9qtJVxznNN+xs/e"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQhxaeElmxO1UgaI/+qr+g13OFeY9qtJVxznNN+xs/e";
}; };