lbailly/infrastructure
1
0
Fork 0
forked from DGNum/infrastructure
Code Pull requests Activity

web01: Finish switching to the new network config

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
machines/web01/_configuration.nix
View file

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

4
machines/web01/networking.nix
View file

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

2
meta/default.nix
View file

@ -31,7 +31,7 @@ let
zone = locations.${node}; zone = locations.${node};
deployment = let old = attrs.deployment; in old // { deployment = let old = attrs.deployment; in old // {
tags = (old.tags or [ ]) ++ [ "infra-${locations.${node}}" ]; tags = (old.tags or [ ]) ++ [ "infra-${locations.${node}}" ];
targetHost = builtins.head network.${node}.addresses.public; targetHost = old.targetHost or (builtins.head network.${node}.addresses.public);
}; };
}; };

2
meta/network.nix
View file

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