add vm working with dhcp+dns
This commit is contained in:
parent
532d76c049
commit
63688f3068
6 changed files with 77 additions and 17 deletions
|
@ -91,6 +91,8 @@
|
||||||
lsof
|
lsof
|
||||||
parted
|
parted
|
||||||
radvd
|
radvd
|
||||||
|
minicom
|
||||||
|
socat
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,12 +28,12 @@
|
||||||
let inherit (config.lab.networking) dmzServicesIPv4 dmzServicesIPv6; in
|
let inherit (config.lab.networking) dmzServicesIPv4 dmzServicesIPv6; in
|
||||||
{
|
{
|
||||||
lab = {
|
lab = {
|
||||||
networking = {
|
# networking = {
|
||||||
# TODO: Ideally, we don't have to set this here.
|
# # TODO: Ideally, we don't have to set this here.
|
||||||
staticDMZIPv4Address = "${dmzServicesIPv4}/24";
|
# staticDMZIPv4Address = "${dmzServicesIPv4}/24";
|
||||||
staticDMZIPv6Address = "${dmzServicesIPv6}/64";
|
# staticDMZIPv6Address = "${dmzServicesIPv6}/64";
|
||||||
dmzServices.enable = true;
|
# dmzServices.enable = true;
|
||||||
};
|
# };
|
||||||
|
|
||||||
storage = {
|
storage = {
|
||||||
osDisk = "/dev/sda";
|
osDisk = "/dev/sda";
|
||||||
|
@ -82,4 +82,16 @@
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hermes = {
|
||||||
|
type = "virtual";
|
||||||
|
hypervisorName = "lewis";
|
||||||
|
nixosModule = {
|
||||||
|
lab = {
|
||||||
|
vmMacAddress = "BA:DB:EE:F0:00:07";
|
||||||
|
vmIsDHCPServer = true;
|
||||||
|
networking.dmzServices.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,11 +90,11 @@ in {
|
||||||
config = {
|
config = {
|
||||||
networking = {
|
networking = {
|
||||||
domain = if machine.type == "physical" then "hyp" else "dmz";
|
domain = if machine.type == "physical" then "hyp" else "dmz";
|
||||||
nftables.enable = true;
|
nftables.enable = false;
|
||||||
useDHCP = machine.type == "virtual";
|
useDHCP = false;
|
||||||
|
|
||||||
firewall = {
|
firewall = {
|
||||||
enable = true;
|
enable = false;
|
||||||
checkReversePath = false;
|
checkReversePath = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,7 +23,8 @@ in
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
lab.networking.allowDMZConnectivity = true;
|
lab.networking.allowDMZConnectivity = true;
|
||||||
|
|
||||||
networking.firewall.interfaces.${config.lab.networking.dmzBridgeName} = {
|
# TODO: listen only on dmz interface, make this portable between physical and VM.
|
||||||
|
networking.firewall = {
|
||||||
allowedTCPPorts = [ 53 5353 ];
|
allowedTCPPorts = [ 53 5353 ];
|
||||||
allowedUDPPorts = [ 53 67 5353 ];
|
allowedUDPPorts = [ 53 67 5353 ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, config, lib, modulesPath, microvm, disko, agenix, machines, ... }: {
|
{ pkgs, config, lib, modulesPath, microvm, disko, agenix, machines, dns, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
microvm.nixosModules.host
|
microvm.nixosModules.host
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
(name: vm:
|
(name: vm:
|
||||||
{
|
{
|
||||||
# TODO Simplify?
|
# TODO Simplify?
|
||||||
specialArgs = { inherit agenix disko pkgs lib microvm; machine = vm; hypervisorConfig = config; };
|
specialArgs = { inherit agenix disko pkgs lib microvm dns; machine = vm; hypervisorConfig = config; };
|
||||||
config.imports = [
|
config.imports = [
|
||||||
./.
|
./.
|
||||||
{ networking.hostName = name; }
|
{ networking.hostName = name; }
|
||||||
|
|
|
@ -1,9 +1,20 @@
|
||||||
{ lib, config, hypervisorConfig, ... }: {
|
{ lib, config, hypervisorConfig, ... }: {
|
||||||
options.lab.vmMacAddress = lib.mkOption {
|
options.lab = {
|
||||||
type = lib.types.str;
|
vmMacAddress = lib.mkOption {
|
||||||
description = ''
|
type = lib.types.str;
|
||||||
The MAC address of the VM's main NIC.
|
description = ''
|
||||||
'';
|
The MAC address of the VM's main NIC.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# TODO: remove this ugly option
|
||||||
|
vmIsDHCPServer = lib.mkOption {
|
||||||
|
default = false;
|
||||||
|
type = lib.types.bool;
|
||||||
|
description = ''
|
||||||
|
Whether this VM is the DHCP server.
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
@ -23,5 +34,39 @@
|
||||||
mac = config.lab.vmMacAddress;
|
mac = config.lab.vmMacAddress;
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
networking.useDHCP = lib.mkForce false;
|
||||||
|
|
||||||
|
systemd.network = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
networks = {
|
||||||
|
"30-main-nic" = {
|
||||||
|
matchConfig.Name = "en*";
|
||||||
|
|
||||||
|
networkConfig = {
|
||||||
|
IPv6AcceptRA = ! config.lab.vmIsDHCPServer;
|
||||||
|
DHCP = lib.mkIf (! config.lab.vmIsDHCPServer) "yes";
|
||||||
|
Address = lib.mkIf config.lab.vmIsDHCPServer [ "192.168.30.7/24" "2a0d:6e00:1a77:30::7/64" ];
|
||||||
|
DNS = lib.mkIf config.lab.vmIsDHCPServer [ "192.168.30.1" "fe80::4262:31ff:fe02:c55f" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
routes = lib.mkIf config.lab.vmIsDHCPServer [
|
||||||
|
{
|
||||||
|
routeConfig = {
|
||||||
|
Gateway = "192.168.30.1";
|
||||||
|
Destination = "0.0.0.0/0";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
routeConfig = {
|
||||||
|
Gateway = "fe80::4262:31ff:fe02:c55f";
|
||||||
|
Destination = "::/0";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue