From ca55a38cb3594d52b7bd808a7d1529db9e4993a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kj@orbekk.com>
Date: Sun, 14 Jun 2020 10:02:00 -0400
Subject: fix network setup on dragon

---
 config/web-server.nix | 3 ---
 machines/dragon.nix   | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/web-server.nix b/config/web-server.nix
index 751f9c3..eb957a5 100644
--- a/config/web-server.nix
+++ b/config/web-server.nix
@@ -30,9 +30,6 @@
       "orbekk.com" = template // {
         root = "/storage/srv/orbekk.com";
       };
-      "shape.orbekk.com" = template // {
-        root = "/storage/srv/orbekk.com";
-      };
       "kj.orbekk.com" = template // {
         root = "/home/orbekk/www-public";
         locations."/" = {
diff --git a/machines/dragon.nix b/machines/dragon.nix
index 3310025..d0c060c 100644
--- a/machines/dragon.nix
+++ b/machines/dragon.nix
@@ -11,7 +11,7 @@ in
     ../config/users.nix
     # ../config/weechat.nix
     ../config/dns.nix
-    ../config/hydra.nix
+    # ../config/hydra.nix
     ../config/web-server.nix
     ../config/cgit.nix
     ../config/mail-server.nix
@@ -74,12 +74,15 @@ in
     firewall.checkReversePath = "loose";
     firewall.logRefusedConnections = false;
 
+    useDHCP = false;
+    interfaces.br0.useDHCP = true;
     bridges = {
       br0 = {
         interfaces = ["eno2"];
       };
     };
 
+    dhcpcd.enable = true;
     dhcpcd.extraConfig = ''
     duid
     ipv6ra_noautoconf
-- 
cgit v1.2.3