summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Ørbekk <kj@orbekk.com>2020-06-14 10:02:00 -0400
committerKjetil Ørbekk <kj@orbekk.com>2020-06-14 10:02:00 -0400
commitca55a38cb3594d52b7bd808a7d1529db9e4993a3 (patch)
tree62f78f79659abe42514b17f27c731a9bebb9f0b6
parent89db23a07c05338419457cf383c4be437c3156a2 (diff)
fix network setup on dragon
-rw-r--r--config/web-server.nix3
-rw-r--r--machines/dragon.nix5
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