From 0a196b0d80fb40905fed3cd120bf0847095c5e4a Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 5 Jun 2020 19:53:54 +0200
Subject: [PATCH] server7: serve nix-serve on yggdrasil

---
 hosts/server7/default.nix   | 20 ++++++++++++++------
 hosts/server7/nix-serve.nix | 14 ++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/hosts/server7/default.nix b/hosts/server7/default.nix
index 11fc3461..c04ad2de 100644
--- a/hosts/server7/default.nix
+++ b/hosts/server7/default.nix
@@ -53,12 +53,20 @@ in {
   services.yggdrasil = {
     enable = true;
     configFile = "/var/lib/yggdrasil/keys";
-    config.Peers = [
-      "tcp://[2a03:3b40:fe:ab::1]:46370" # Praha
-      "tcp://ygg.thingylabs.io:443" # Nürnberg
-      "tcp://176.223.130.120:22632" # Wrocław
-      "tcp://[2a05:9403::8b]:7743" # Praha
-    ];
+    config = {
+      Peers = [
+        "tcp://[2a03:3b40:fe:ab::1]:46370" # Praha
+        "tcp://ygg.thingylabs.io:443" # Nürnberg
+        "tcp://176.223.130.120:22632" # Wrocław
+        "tcp://[2a05:9403::8b]:7743" # Praha
+      ];
+      NodeInfo = {
+        location = "Dresden";
+        name = "server7.y.c3d2.de";
+        admin =
+          "toxid:DF0AC9107E0A30E7201C6832B017AC836FBD1EDAC390EE99B68625D73C3FD929FB47F1872CA4";
+      };
+    };
   };
 
   security.sudo.wheelNeedsPassword = false;
diff --git a/hosts/server7/nix-serve.nix b/hosts/server7/nix-serve.nix
index 58c6d80a..13a3739a 100644
--- a/hosts/server7/nix-serve.nix
+++ b/hosts/server7/nix-serve.nix
@@ -10,15 +10,17 @@
 
   services.nginx = {
     enable = true;
-    virtualHosts = {
-      "cache.server7.hq.c3d2.de" = {
+    virtualHosts = let
+      vhost.locations."/".proxyPass =
+        "http://${config.services.nix-serve.bindAddress}:${
+          toString config.services.nix-serve.port
+        }";
+    in {
+      "cache.server7.hq.c3d2.de" = vhost // {
         addSSL = true;
         enableACME = true;
-        locations."/".proxyPass =
-          "http://${config.services.nix-serve.bindAddress}:${
-            toString config.services.nix-serve.port
-          }";
       };
+      "nix-serve.y.c3d2.de" = vhost;
     };
   };