Merge remote-tracking branch 'krebs/master'

This commit is contained in:
tv 2023-01-27 19:08:38 +01:00
commit f8b3e682df

View File

@ -1,5 +1,6 @@
with import ../../lib;
{ config, ... }: let
{ config, ... }:
let
hostDefaults = hostName: host: flip recursiveUpdate host ({
ci = false;
@ -13,62 +14,15 @@ with import ../../lib;
(krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address;
});
in {
in
{
hosts = mapAttrs hostDefaults {
pepe = {
owner = config.krebs.users.palo;
nets = {
retiolum = {
ip4.addr = "10.243.23.1";
tinc.port = 720;
aliases = [ "pepe.r" ];
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
};
schasch = {
owner = config.krebs.users.palo;
nets = {
retiolum = {
ip4.addr = "10.243.23.2";
tinc.port = 720;
aliases = [ "schasch.r" ];
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
syncthing.id = "FLY7DHI-TJLEQBJ-JZNC4YV-NBX53Z2-ZBRWADL-BKSFXYZ-L4FMDVH-MOSEVAQ";
};
sterni = {
owner = config.krebs.users.palo;
nets = {
retiolum = {
ip4.addr = "10.243.23.3";
tinc.port = 720;
aliases = [
"sterni.r"
];
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
};
workhorse = {
owner = config.krebs.users.palo;
nets = {
retiolum = {
ip4.addr = "10.243.23.5";
tinc.port = 720;
aliases = [ "workhorse.r" ];
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};
};
workout = {
owner = config.krebs.users.palo;
nets = {
retiolum = {
ip4.addr = "10.243.23.4";
tinc.port = 720;
aliases = [ "workout.r" ];
aliases = [ "sterni.r" ];
tinc.pubkey = builtins.readFile ./retiolum.pub;
};
};