dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #334508 from pbsds/fix-taskserver-1723599512

Browse Source 
nixos/taskserver: fix test eval
This commit is contained in:
Peder Bergebakken Sundt 2024-08-16 00:44:26 +02:00 committed by GitHub
commit db16f389ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/taskserver.nix
View File

@ -70,7 +70,7 @@ in {
anotherOrganisation.users = [ "bob" ]; anotherOrganisation.users = [ "bob" ];
}; };
specialisation.manual-config.configuration = { specialisation.manual_config.configuration = {
services.taskserver.pki.manual = { services.taskserver.pki.manual = {
ca.cert = snakeOil.cacert; ca.cert = snakeOil.cacert;
server.cert = snakeOil.cert; server.cert = snakeOil.cert;
@ -95,7 +95,7 @@ in {
cfg = nodes.server.config.services.taskserver; cfg = nodes.server.config.services.taskserver;
portStr = toString cfg.listenPort; portStr = toString cfg.listenPort;
specialisations = "${nodes.server.system.build.toplevel}/specialisation"; specialisations = "${nodes.server.system.build.toplevel}/specialisation";
newServerSystem = "${specialisations}/manual-config"; newServerSystem = "${specialisations}/manual_config";
switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test";
in '' in ''
from shlex import quote from shlex import quote