This commit is contained in:
shelvacu
2024-06-28 16:07:16 -07:00
parent e3196b48ca
commit e7a60417a2
4 changed files with 23 additions and 2 deletions

View File

@@ -1,6 +1,10 @@
{ lib, pkgs, config, inputs, utils, ... }:
{
imports = [ ./common-config.nix ];
options.vacu.underTest = lib.mkOption {
default = false;
type = lib.types.bool;
};
options.vacu.acmeCertDependencies = lib.mkOption {
default = {};
example = ''

View File

@@ -45,6 +45,21 @@
# "netmask": "255.255.0.0",
# "gateway": "10.46.0.1"
# }
networking.interfaces."ens3" = {
useDHCP = true;
ipv4.addresses = [{
address = "10.46.0.7";
prefixLength = 24;
}];
ipv4.routes = [{
address = "0.0.0.0";
prefixLength = 0;
via = "10.46.0.1"
options.scope = "global";
options.src = "10.46.0.7";
options.metric = "1200";
}];
};
services.openssh.enable = true;
@@ -54,4 +69,4 @@
system.stateVersion = "23.11";
};
}
}

View File

@@ -34,6 +34,7 @@
nodes.liam = { lib, ... }: {
imports = [ ../liam ];
vacu.underTest = true;
systemd.services."acme-liam.dis8.net".enable = lib.mkForce false;
systemd.timers."acme-liam.dis8.net".enable = lib.mkForce false;
systemd.services."acme-selfsigned-liam.dis8.net".wantedBy = [ "postfix.service" "dovecot2.service" ];

View File

@@ -28,6 +28,7 @@
);
in {
imports = [ ../triple-dezert ];
vacu.underTest = true;
systemd.services = disableAcmes // reEnableSelfsigned;
systemd.units = disableUnits;
#vacu.secretsFolder = ./test_secrets;
@@ -93,4 +94,4 @@
triple_dezert.wait_for_open_port(80)
triple_dezert.succeed("curl -vv http://shelvacu.com/ --resolve shelvacu.com:80:127.0.0.1")
'';
}
}