web01: Finish switching to the new network config
This commit is contained in:
parent
6c0e2818ac
commit
ef211567a8
4 changed files with 3 additions and 6 deletions
|
@ -7,7 +7,6 @@
|
|||
{
|
||||
imports =
|
||||
[
|
||||
./networking.nix
|
||||
./plausible.nix
|
||||
# ./wordpress
|
||||
];
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
{ lib, ... }: {
|
||||
# TODO: Switch to networkd
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
}
|
|
@ -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);
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -65,5 +65,7 @@ builtins.mapAttrs mkNet {
|
|||
gateways = [ "129.199.129.1" ];
|
||||
};
|
||||
};
|
||||
|
||||
hostId = "050df79e";
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue