kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

remove unused acme node for data model tests (#540)

Browse source 
Reviewed-on: fediversity/fediversity#540
This commit is contained in:
Kiara Grouwstra 2025-10-11 14:00:04 +02:00
parent 82d6059158
commit e964bbb517
7 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
deployment/check/common/nixosTest.nix
View file

@ -80,41 +80,44 @@ in
acmeNodeIP = config.nodes.acme.networking.primaryIPAddress; acmeNodeIP = config.nodes.acme.networking.primaryIPAddress;
nodes = nodes = lib.mkMerge [
{ {
deployer = { deployer = lib.mkMerge [
imports = [ ./deployerNode.nix ]; {
_module.args = { inherit inputs sources; }; imports = [ ./deployerNode.nix ];
enableAcme = config.enableAcme; _module.args = { inherit inputs sources; };
acmeNodeIP = config.nodes.acme.networking.primaryIPAddress; enableAcme = config.enableAcme;
}; }
(lib.mkIf config.enableAcme {
acmeNodeIP = config.nodes.acme.networking.primaryIPAddress;
security.acme = {
acceptTerms = true;
defaults.email = "test@test.com";
defaults.server = "https://acme.test/dir";
};
security.pki.certificateFiles = [
(import "${inputs.nixpkgs}/nixos/tests/common/acme/server/snakeoil-certs.nix").ca.cert
];
networking.extraHosts = "${config.acmeNodeIP} acme.test";
})
];
} }
(lib.mkIf config.enableAcme {
// acme = {
## FIXME: This makes `nodes.acme` into a local resolver. Maybe this will
( ## break things once we play with DNS?
if config.enableAcme then imports = [ "${inputs.nixpkgs}/nixos/tests/common/acme/server" ];
{ ## We aren't testing ACME - we just want certificates.
acme = { systemd.services.pebble.environment.PEBBLE_VA_ALWAYS_VALID = "1";
## FIXME: This makes `nodes.acme` into a local resolver. Maybe this will };
## break things once we play with DNS? })
imports = [ "${inputs.nixpkgs}/nixos/tests/common/acme/server" ]; (genAttrs config.targetMachines (_: {
## We aren't testing ACME - we just want certificates. imports = [ ./targetNode.nix ];
systemd.services.pebble.environment.PEBBLE_VA_ALWAYS_VALID = "1"; _module.args = { inherit inputs sources; };
}; enableAcme = config.enableAcme;
} acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null;
else }))
{ } ];
)
//
genAttrs config.targetMachines (_: {
imports = [ ./targetNode.nix ];
_module.args = { inherit inputs sources; };
enableAcme = config.enableAcme;
acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null;
});
testScript = '' testScript = ''
${forConcat (attrNames config.nodes) (n: '' ${forConcat (attrNames config.nodes) (n: ''

1
deployment/check/data-model-nixops4/constants.nix
View file

@ -4,6 +4,5 @@
]; ];
pathToRoot = ../../..; pathToRoot = ../../..;
pathFromRoot = ./.; pathFromRoot = ./.;
enableAcme = true;
useFlake = true; useFlake = true;
} }

1
deployment/check/data-model-nixops4/default.nix
View file

@ -16,7 +16,6 @@ runNixOSTest {
targetMachines targetMachines
pathToRoot pathToRoot
pathFromRoot pathFromRoot
enableAcme
useFlake useFlake
; ;
} }

1
deployment/check/data-model-ssh/constants.nix
View file

@ -8,5 +8,4 @@
name = "root"; name = "root";
}; };
pathFromRoot = "/deployment/check/data-model-ssh"; pathFromRoot = "/deployment/check/data-model-ssh";
enableAcme = true;
} }

1
deployment/check/data-model-ssh/default.nix
View file

@ -16,6 +16,5 @@ runNixOSTest {
targetMachines targetMachines
pathToRoot pathToRoot
pathFromRoot pathFromRoot
enableAcme
; ;
} }

1
deployment/check/data-model-tf/constants.nix
View file

@ -7,5 +7,4 @@
name = "root"; name = "root";
}; };
pathFromRoot = "/deployment/check/data-model-tf"; pathFromRoot = "/deployment/check/data-model-tf";
enableAcme = true;
} }

1
deployment/check/data-model-tf/default.nix
View file

@ -46,6 +46,5 @@ pkgs.testers.runNixOSTest {
targetMachines targetMachines
pathToRoot pathToRoot
pathFromRoot pathFromRoot
enableAcme
; ;
} }