lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

hm: switch to new blast access via cloudflared

Browse source
This commit is contained in:
Luke Granger-Brown 2023-12-16 15:17:28 +00:00
parent f4307f55fc
commit cb6cded6be
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ops/nixos/lib/home-manager/common.nix
View file

@ -56,15 +56,11 @@ in
forwardAgent = true; forwardAgent = true;
matchBlocks = let matchBlocks = let
allEventBlocks = (lib.concatStringsSep " " (builtins.map (n: "172.${toString n}.*.*") (lib.range 16 31))); allEventBlocks = (lib.concatStringsSep " " (builtins.map (n: "172.${toString n}.*.*") (lib.range 16 31)));
blast-tmpl = ip: { blast-tmpl = hostname: {
user = "root"; user = "root";
port = 888; extraOptions.proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname ${hostname}";
hostname = ip;
extraOptions.setEnv = "TERM=xterm-256color"; extraOptions.setEnv = "TERM=xterm-256color";
}; };
blast-jump-tmpl = ip: via: (blast-tmpl ip) // {
proxyJump = via;
};
in ({ in ({
sar1 = { sar1 = {
hostname = "172.16.0.1"; hostname = "172.16.0.1";
@ -81,14 +77,11 @@ in
port = 8080; port = 8080;
}; };
blast-worker1 = blast-tmpl "10.200.109.10"; blast-ninio-010 = blast-tmpl "blast-ninio-010-ssh.faceit.com";
blast-worker1-jump = blast-jump-tmpl "10.200.109.10" "blast-csgo1-jump"; blast-ninio-011 = blast-tmpl "blast-ninio-011-ssh.faceit.com";
blast-worker2 = blast-tmpl "10.200.109.11"; blast-ninio-012 = blast-tmpl "blast-ninio-012-ssh.faceit.com";
blast-worker2-jump = blast-jump-tmpl "10.200.109.11" "blast-csgo2-jump"; blast-ninio-013 = blast-tmpl "blast-ninio-013-ssh.faceit.com";
blast-csgo1 = blast-tmpl "10.200.109.12"; blast-ninio-014 = blast-tmpl "blast-ninio-014-ssh.faceit.com";
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";
whitby = { whitby = {
hostname = "whitby.tvl.fyi"; hostname = "whitby.tvl.fyi";