From 854215422949e553178d6b8fbc82ebec05ef7c20 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 31 Jan 2022 11:36:23 +0100 Subject: tv ni wiregrill: add via --- krebs/3modules/tv/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'krebs/3modules/tv') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 4e40561c2..2c0e653fd 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -200,9 +200,12 @@ in { ''; tinc.pubkey_ed25519 = "nDuK96NlNhcxzlX7G30w/706RxItb+FhkFkz/VhUgCE"; }; - wiregrill.wireguard.subnets = [ - (krebs.genipv6 "wiregrill" "tv" 0).subnetCIDR - ]; + wiregrill = { + via = config.krebs.hosts.ni.nets.internet; + wireguard.subnets = [ + (krebs.genipv6 "wiregrill" "tv" 0).subnetCIDR + ]; + }; }; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGDdcKwFm6udU0/x6XGGb87k9py0VlrxF54HeYu9Izb"; }; -- cgit v1.2.3 From 9e577d3b88986c554bcc0ba62a471875709a85d4 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 31 Jan 2022 16:05:39 +0100 Subject: tv ni wiregrill: assign ipv4 addr --- krebs/3modules/tv/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs/3modules/tv') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 2c0e653fd..a9e50a99f 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -202,6 +202,7 @@ in { }; wiregrill = { via = config.krebs.hosts.ni.nets.internet; + ip4.addr = "10.244.3.1"; wireguard.subnets = [ (krebs.genipv6 "wiregrill" "tv" 0).subnetCIDR ]; -- cgit v1.2.3 From e7884ba3914e971807bdcf345096478d00317de7 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 31 Jan 2022 16:06:26 +0100 Subject: tv umz: init --- krebs/3modules/tv/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'krebs/3modules/tv') diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index a9e50a99f..e096118c6 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -349,6 +349,9 @@ in { ssh.privkey.path = ; ssh.pubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDNjHxyUC7afNGSwfwBfQizmDnHTNLWDRHE8SY9W4oiw2lPhCFGTN8Jz84CKtnABbZhbNY1E8T58emF2h45WzDg/OGi8DPAk4VsXSkIhyvAto+nkTy2L4atjqfvXDvqxTDC9sui+t8p5OqOK+sghe4kiy+Vx1jhnjSnkQsx9Kocu24BYTkNqYxG7uwOz6t262XYNwMn13Y2K/yygDR3Uw3wTnEjpaYnObRxxJS3iTECDzgixiQ6ewXwYNggpzO/+EfW1BTz5vmuEVf4GbQ9iEc7IsVXHhR+N0boCscvSgae9KW9MBun0A2veRFXNkkfBEMfzelz+S63oeVfelkBq6N5aLsHYYGC4VQjimScelHYVwxR7O4fV+NttJaFF7H06FJeFzPt3NYZeoPKealD5y2Muh1UnewpmkMgza9hQ9EmI4/G1fMowqeMq0U6Hu0QMDUAagyalizN97AfsllY2cs0qLNg7+zHMPwc5RgLzs73oPUsF3umz0O42I5p5733vveUlWi5IZeI8CA1ZKdpwyMXXNhIOHs8u+yGsOLfSy3RgjVKp2GjN4lfnFd0LI+p7iEsEWDRkIAvGCOFepsebyVpBjGP+Kqs10bPGpk5dMcyn9iBJejoz9ka+H9+JAG04LnXwt6Rf1CRV3VRCRX1ayZEjRv9czV7U9ZpuFQcIlVRJQ== root@zu"; }; + umz = { + nets.wiregrill.ip4.addr = "10.244.3.101"; + }; }; sitemap = { "http://cgit.krebsco.de" = { -- cgit v1.2.3 From f4cb095b72a943c320a8134af3e8f45ca9dd2c49 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 2 Feb 2022 08:53:11 +0100 Subject: tv umz: add wiregrill pubkey --- krebs/3modules/tv/wiregrill/umz.pub | 1 + 1 file changed, 1 insertion(+) create mode 100644 krebs/3modules/tv/wiregrill/umz.pub (limited to 'krebs/3modules/tv') diff --git a/krebs/3modules/tv/wiregrill/umz.pub b/krebs/3modules/tv/wiregrill/umz.pub new file mode 100644 index 000000000..c041b5eee --- /dev/null +++ b/krebs/3modules/tv/wiregrill/umz.pub @@ -0,0 +1 @@ +FpghL2Drdg+xwqcOsDgePgUx3X3XsX9f56BPLuF690g= -- cgit v1.2.3