diff options
| author | lassulus <lassulus@lassul.us> | 2022-02-14 16:39:07 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-02-14 16:39:07 +0100 |
| commit | 29dbbbb453bd4fabd91a21f9c3a1f37521b2aec8 (patch) | |
| tree | be73c97e690acb90698da87c0bbec3fc46831a0e /krebs | |
| parent | 7c0e9338e55ecbfd16e71d7d559d5fabf479b371 (diff) | |
| parent | 65e0d322822522a9c73d3a14b34e878a86f6154b (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/tv/default.nix | 13 | ||||
| -rw-r--r-- | krebs/3modules/tv/wiregrill/umz.pub | 1 |
2 files changed, 11 insertions, 3 deletions
diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index 4e40561c2..e096118c6 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -200,9 +200,13 @@ 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; + ip4.addr = "10.244.3.1"; + wireguard.subnets = [ + (krebs.genipv6 "wiregrill" "tv" 0).subnetCIDR + ]; + }; }; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGDdcKwFm6udU0/x6XGGb87k9py0VlrxF54HeYu9Izb"; }; @@ -345,6 +349,9 @@ in { ssh.privkey.path = <secrets/ssh.id_rsa>; 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" = { 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= |