diff options
| -rw-r--r-- | krebs/3modules/tv/default.nix | 40 | ||||
| -rw-r--r-- | makefu/1systems/gum.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/retiolum.nix | 1 |
4 files changed, 2 insertions, 43 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 5773255ec..0e7535e6c 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -162,46 +162,6 @@ with import <stockholm/lib>; }; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHM6dL0fQ8Bd0hER0Xa3I2pAWVHdnwOBaAZhbDlLJmUu"; }; - ire = { - extraZones = { - # TODO generate krebsco.de zone from nets and don't use extraZones at all - "krebsco.de" = '' - ire 60 IN A ${config.krebs.hosts.ire.nets.internet.ip4.addr} - ''; - }; - nets = { - internet = { - ip4.addr = "198.147.22.115"; - aliases = [ - "ire.i" - "ire.internet" - "ire.krebsco.de" - ]; - ssh.port = 11423; - }; - retiolum = { - via = config.krebs.hosts.ire.nets.internet; - ip4.addr = "10.243.231.66"; - ip6.addr = "42:b912:0f42:a82d:0d27:8610:e89b:490c"; - aliases = [ - "ire.r" - "ire.retiolum" - ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEAwofjmP/XBf5pwsJlWklkSzI+Bo0I0B9ONc7/j+zpbmMRkwbWk4X7 - rVLt1cWvTY15ujg2u8l0o6OgEbIkc6rslkD603fv1sEAd0KOv7iKLgRpE9qfSvAt - 6YpiSv+mxEMTpH0g36OmBfOJ10uT+iHDB/FfxmgGJx//jdJADzLjjWC6ID+iGkGU - 1Sf+yHXF7HRmQ29Yak8LYVCJpGC5bQfWIMSL5lujLq4NchY2d+NZDkuvh42Ayr0K - LPflnPBQ3XnKHKtSsnFR2vaP6q+d3Opsq/kzBnAkjL26jEuFK1v7P/HhNhJoPzwu - nKKWj/W/k448ce374k5ycjvKm0c6baAC/wIDAQAB - -----END RSA PUBLIC KEY----- - ''; - ssh.port = 11423; - }; - }; - ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBaMjBJ/BfYlHjyn5CO0xzFNaQ0LPvMP3W9UlOs1OxGY"; - }; kaepsele = { nets = { internet = { diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 178d496f3..c9d424888 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -40,7 +40,7 @@ in { ''; connectTo = [ "muhbaasu" "tahoe" "flap" "wry" - "ire" "cd" "mkdir" "rmdir" + "cd" "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs" ]; }; diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 32e4b4503..b80479eaa 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "b8ede35d2efa96490857c22c751e75d600bea44f"; + ref = "31c72ce266b0179efa877bb3acd7dfd7b746537b"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix index 0abc96822..ad1116d4f 100644 --- a/tv/2configs/retiolum.nix +++ b/tv/2configs/retiolum.nix @@ -10,7 +10,6 @@ with import <stockholm/lib>; "prism" "echelon" "cd" - "ire" ]; tincPackage = pkgs.tinc_pre; }; |