diff --git a/ops/nixos/lib/home-manager/common.nix b/ops/nixos/lib/home-manager/common.nix index 5da264a1ae..a8bbd72c2b 100644 --- a/ops/nixos/lib/home-manager/common.nix +++ b/ops/nixos/lib/home-manager/common.nix @@ -56,15 +56,11 @@ in forwardAgent = true; matchBlocks = let allEventBlocks = (lib.concatStringsSep " " (builtins.map (n: "172.${toString n}.*.*") (lib.range 16 31))); - blast-tmpl = ip: { + blast-tmpl = hostname: { user = "root"; - port = 888; - hostname = ip; + extraOptions.proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname ${hostname}"; extraOptions.setEnv = "TERM=xterm-256color"; }; - blast-jump-tmpl = ip: via: (blast-tmpl ip) // { - proxyJump = via; - }; in ({ sar1 = { hostname = "172.16.0.1"; @@ -81,14 +77,11 @@ in port = 8080; }; - blast-worker1 = blast-tmpl "10.200.109.10"; - blast-worker1-jump = blast-jump-tmpl "10.200.109.10" "blast-csgo1-jump"; - blast-worker2 = blast-tmpl "10.200.109.11"; - blast-worker2-jump = blast-jump-tmpl "10.200.109.11" "blast-csgo2-jump"; - blast-csgo1 = blast-tmpl "10.200.109.12"; - blast-csgo1-jump = blast-jump-tmpl "10.222.0.2" "bvm-netbox"; - blast-csgo2 = blast-tmpl "10.200.109.13"; - blast-csgo2-jump = blast-jump-tmpl "10.222.0.3" "bvm-netbox"; + blast-ninio-010 = blast-tmpl "blast-ninio-010-ssh.faceit.com"; + blast-ninio-011 = blast-tmpl "blast-ninio-011-ssh.faceit.com"; + blast-ninio-012 = blast-tmpl "blast-ninio-012-ssh.faceit.com"; + blast-ninio-013 = blast-tmpl "blast-ninio-013-ssh.faceit.com"; + blast-ninio-014 = blast-tmpl "blast-ninio-014-ssh.faceit.com"; whitby = { hostname = "whitby.tvl.fyi";