diff options
-rw-r--r-- | config/web-server.nix | 3 | ||||
-rw-r--r-- | data/dns/db.orbekk.shared.zone | 3 | ||||
-rw-r--r-- | machines/dragon.nix | 5 |
3 files changed, 5 insertions, 6 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/data/dns/db.orbekk.shared.zone b/data/dns/db.orbekk.shared.zone index 41787c4..507e883 100644 --- a/data/dns/db.orbekk.shared.zone +++ b/data/dns/db.orbekk.shared.zone @@ -22,8 +22,7 @@ _acme-challenge IN CNAME _acme-challenge.dynamic.orbekk.com. smtp IN CNAME semeai -home IN CNAME orbekk-lic.duckdns.org. -terraria IN CNAME orbekk-lic.duckdns.org. +38th IN CNAME orbekk.duckdns.org. git IN CNAME dragon hydra IN CNAME dragon 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 |