diff options
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/default.nix | 10 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 2 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 43 |
4 files changed, 50 insertions, 7 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index ec85464df..e6ad449fa 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -90,11 +90,11 @@ let }; imp = lib.mkMerge [ - { krebs = import ./lass { inherit config lib; }; } - { krebs = import ./makefu { inherit config lib; }; } - { krebs = import ./mv { inherit config lib; }; } - { krebs = import ./shared { inherit config lib; }; } - { krebs = import ./tv { inherit config lib; }; } + { krebs = import ./lass { inherit config; }; } + { krebs = import ./makefu { inherit config; }; } + { krebs = import ./mv { inherit config; }; } + { krebs = import ./shared { inherit config; }; } + { krebs = import ./tv { inherit config; }; } { krebs.dns.providers = { "krebsco.de" = "zones"; diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index ad1221e8e..5af1e37cd 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: with import <stockholm/lib>; diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 7317e0b60..ff187b878 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, ... }: with import <stockholm/lib>; diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 0e7535e6c..eaec64d50 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -218,6 +218,49 @@ with import <stockholm/lib>; ssh.privkey.path = <secrets/ssh.id_ed25519>; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM1vJsAddvxMA84u9iJEOrIkKn7pQiemMbfW5cfK1d7g root@mu"; }; + ni = { + extraZones = { + "krebsco.de" = '' + ni 60 IN A ${config.krebs.hosts.ni.nets.internet.ip4.addr} + ''; + }; + nets = { + internet = { + ip4.addr = "188.68.36.196"; + aliases = [ + "ni.i" + ]; + ssh.port = 11423; + }; + retiolum = { + via = config.krebs.hosts.ni.nets.internet; + ip4.addr = "10.243.113.223"; + ip6.addr = "42:4522:25f8:36bb:8ccb:0150:231a:2af4"; + aliases = [ + "ni.r" + "ni.retiolum" + "cgit.ni.r" + "cgit.ni.retiolum" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEA7NHuW8eLVhpBfL70WwcSGVmv4dijKLJs5cH/BmqK8zN2lpiLKt12 + bhaE1YEhGoGma7Kef1Fa0V9xUkJy6C1+sVlfWp/LeY8VRSX5E3u36TEl6kl/4zu6 + Ea/44BoGUSOC9ImxVEX51czA10PFjUSrGFyK0oaRlKNsTwwpNiBOY7/6i74bhn59 + OIsySRUBd2QPjYhJkiuc7gltVfwt6wteZh8R4w2rluVGYLQPsmN/XEWgJbhzI4im + W+3/bdewHVF1soZWtdocPLeXTn5HETX5g8p2V3bwYL37oIwkCcYxOeQtT7W+lNJ2 + NvIiVh4Phojl4dBUgUQGT0NApMnsaG/4LJpSC4AGiqbsznBdSPhepob7zJggPnWY + nfAs+YrUUZp1wovhSgWfYTRglRuyYvWkoGbq411H1efawyZ0gcMr+HQlSn2keQOv + lbcvdgOAxQiEcPVixPq3mTeKaSxWyIJGFceuqtnILGifRNvViX0uo9g5rLQ41PrJ + 9F3azz3gD2Uh73j5pvLU72cge7p1a7epPYWTJYf8oc5JcI3nYTKpSqH8IYaWUjv9 + q0NwOYFDhYtUcTwdbUNl/tUWKyBcovIe7f40723pHSijiPV2WDZC2M/mOc3dvWKF + Mf00uin+7uMuKtnG6+1z5nKb/AWrqN1RZu0rnG/IkZPKwa19HYsYcOkCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + }; + }; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGDdcKwFm6udU0/x6XGGb87k9py0VlrxF54HeYu9Izb"; + }; nomic = { cores = 2; nets = { |