diff --git a/machines/web01/_configuration.nix b/machines/web01/_configuration.nix index 4bf5139..aa6a06c 100644 --- a/machines/web01/_configuration.nix +++ b/machines/web01/_configuration.nix @@ -7,7 +7,6 @@ { imports = [ - ./networking.nix ./plausible.nix # ./wordpress ]; diff --git a/machines/web01/networking.nix b/machines/web01/networking.nix deleted file mode 100644 index cd57656..0000000 --- a/machines/web01/networking.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: { - # TODO: Switch to networkd - networking.useDHCP = lib.mkDefault true; -} diff --git a/meta/default.nix b/meta/default.nix index cb11765..a719a8b 100644 --- a/meta/default.nix +++ b/meta/default.nix @@ -31,7 +31,7 @@ let zone = locations.${node}; deployment = let old = attrs.deployment; in old // { tags = (old.tags or [ ]) ++ [ "infra-${locations.${node}}" ]; - targetHost = builtins.head network.${node}.addresses.public; + targetHost = old.targetHost or (builtins.head network.${node}.addresses.public); }; }; diff --git a/meta/network.nix b/meta/network.nix index c83105c..4a4f4d3 100644 --- a/meta/network.nix +++ b/meta/network.nix @@ -65,5 +65,7 @@ builtins.mapAttrs mkNet { gateways = [ "129.199.129.1" ]; }; }; + + hostId = "050df79e"; }; }