From edf1786377069a43edc290a7bc8162e166f5793b Mon Sep 17 00:00:00 2001 From: kat witch Date: Sat, 25 Sep 2021 03:54:05 +0100 Subject: [PATCH] hosts/marisa: ygg endpoint, hosts/daiyousei: ygg --- config/hosts/daiyousei.nix | 5 +++++ config/hosts/marisa.nix | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config/hosts/daiyousei.nix b/config/hosts/daiyousei.nix index b17494c3..2ff41d3f 100644 --- a/config/hosts/daiyousei.nix +++ b/config/hosts/daiyousei.nix @@ -28,6 +28,11 @@ }; }; + network.yggdrasil = { + enable = true; + pubkey = "0db7838e7cbab0dc0694f09b683b3a064bf63665415f2af47d1269c2861ffc20"; + }; + services.nginx.virtualHosts = let splashy = pkgs.host-splash-site config.networking.hostName; diff --git a/config/hosts/marisa.nix b/config/hosts/marisa.nix index 2860f36f..c8b1753e 100644 --- a/config/hosts/marisa.nix +++ b/config/hosts/marisa.nix @@ -65,7 +65,19 @@ nixos.ipv4.address = "104.244.72.5"; nixos.ipv6.address = "2605:6400:30:eed1:6cf7:bbfc:b4e:15c0"; }; - firewall.public.interfaces = singleton "ens3"; + yggdrasil = { + enable = true; + pubkey = "3b171319fbb6be1716c99f36b83a70346ec655d99afde410a50ca61a1c278c7c"; + listen.enable = true; + listen.endpoints = [ "tcp://${config.network.addresses.public.nixos.ipv4.address}:52969" "tcp://[${config.network.addresses.public.nixos.ipv6.address}]:52969" ]; + }; + firewall = { + public = { + interfaces = singleton "ens3"; + tcp.ports = singleton 62969; + }; + private.interfaces = singleton "yggdrasil"; + }; }; fileSystems."/" ={