diff options
Diffstat (limited to 'kartei')
| -rw-r--r-- | kartei/palo/default.nix | 56 | ||||
| -rw-r--r-- | kartei/tv/wiregrill/ru.pub | 1 |
2 files changed, 6 insertions, 51 deletions
diff --git a/kartei/palo/default.nix b/kartei/palo/default.nix index 4caf41f87..9d35c3808 100644 --- a/kartei/palo/default.nix +++ b/kartei/palo/default.nix @@ -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; }; }; diff --git a/kartei/tv/wiregrill/ru.pub b/kartei/tv/wiregrill/ru.pub new file mode 100644 index 000000000..4a997c968 --- /dev/null +++ b/kartei/tv/wiregrill/ru.pub @@ -0,0 +1 @@ ++3GdhwFYmBr46bBwyqrY3UH9fU1b8c2Vqmx9JTY4syU= |