web01: Finish switching to the new network config

This commit is contained in:
Tom Hubrecht 2023-07-20 15:48:01 +02:00
parent 6c0e2818ac
commit ef211567a8
4 changed files with 3 additions and 6 deletions

View file

@ -7,7 +7,6 @@
{
imports =
[
./networking.nix
./plausible.nix
# ./wordpress
];

View file

@ -1,4 +0,0 @@
{ lib, ... }: {
# TODO: Switch to networkd
networking.useDHCP = lib.mkDefault true;
}

View file

@ -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);
};
};

View file

@ -65,5 +65,7 @@ builtins.mapAttrs mkNet {
gateways = [ "129.199.129.1" ];
};
};
hostId = "050df79e";
};
}