kenji/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

WIP

Browse Source
This commit is contained in:
a-kenji 2024-07-08 11:03:15 +02:00
parent 7275d7bd92
commit 7301f99557
4 changed files with 99 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
.nixos-test-history
View File

@ -4,3 +4,63 @@
# 2024-07-08 09:53:27.998282
+test_script()
# 2024-07-08 09:57:06.655668
+start_all()
# 2024-07-08 10:12:11.958922
+test_script()
# 2024-07-08 10:14:31.341330
+start_all()
# 2024-07-08 10:14:46.816810
+test_script()
# 2024-07-08 10:16:25.901101
+start_all()
# 2024-07-08 10:16:53.785924
+test_script()
# 2024-07-08 10:17:59.793481
+start_all()
# 2024-07-08 10:18:13.492962
+test_script()
# 2024-07-08 10:24:24.359403
+start_all()
# 2024-07-08 10:24:38.784645
+test_script()
# 2024-07-08 10:27:19.337690
+start_all()
# 2024-07-08 10:27:45.397492
+test_script()
# 2024-07-08 10:32:42.298332
+start_all()
# 2024-07-08 10:32:59.648562
+test_script()
# 2024-07-08 10:35:12.930557
+start_all()
# 2024-07-08 10:36:20.360676
+test_script()
# 2024-07-08 10:38:35.799660
+start_all()
# 2024-07-08 10:38:53.768111
+test_script()
# 2024-07-08 11:01:24.989962
+start_all()
# 2024-07-08 11:01:44.313344
+test_script()

43
checks/mumble/default.nix
View File

@ -12,12 +12,9 @@
clan.core.clanDir = ./.;
environment.systemPackages = [
pkgs.litecli
pkgs.xdotool
pkgs.killall
];
# clan.core.facts.secretStore = "vm";
# environment.etc."secret".source = config.sops.secrets.secret.path;
# environment.etc."group-secret".source = config.sops.secrets.group-secret.path;
# sops.age.keyFile = "/etc/privkey.age";
# sops.validateSopsFiles = false;
}
];
@ -26,6 +23,8 @@
{
name = "mumble";
enableOCR = true;
nodes.peer1 =
{ ... }:
{
@ -119,6 +118,40 @@
with subtest("Wait for Mumble"):
peer1.wait_for_window(r"^Mumble$")
peer2.wait_for_window(r"^Mumble$")
with subtest("Wait for certificate creation"):
peer1.wait_for_window(r"^Mumble$")
peer1.sleep(5) # mumble is slow to register handlers
peer1.send_chars("\n")
peer1.send_chars("\n")
peer2.wait_for_window(r"^Mumble$")
peer2.sleep(5) # mumble is slow to register handlers
peer2.send_chars("\n")
peer2.send_chars("\n")
with subtest("Wait for server connect"):
peer1.wait_for_window(r"^Mumble Server Connect$")
# peer1.wait_for_text("peer2")
peer2.wait_for_window(r"^Mumble Server Connect$")
# peer2.wait_for_text("peer1")
with subtest("Check validity of server certificate"):
peer1.execute("killall .mumble-wrapped")
peer1.sleep(2)
peer1.execute("mumble mumble://peer2 >&2 &")
peer1.wait_for_window(r"^Mumble$")
peer1.sleep(5) # mumble is slow to register handlers
peer1.send_chars("\n")
peer1.send_chars("\n")
peer1.wait_for_text("Connected.")
peer2.execute("killall .mumble-wrapped")
peer2.sleep(2)
peer2.execute("mumble mumble://peer1 >&2 &")
peer2.wait_for_window(r"^Mumble$")
peer2.sleep(4) # mumble is slow to register handlers
peer2.send_chars("\n")
peer2.send_chars("\n")
peer2.wait_for_text("Connected.")
'';
}
)

2
clanModules/mumble/default.nix
View File

@ -123,7 +123,7 @@ in
${populate-channels} --machines '${machineJson}' --username ${config.clan.core.machineName} --db-location ${mumbleDatabasePath}
# ${populate-channels} --digest 'ccaff7d812173fd5e7a8ce116e2f5138815ac811' --username ${config.clan.core.machineName} --db-location ${mumbleDatabasePath} --cert True
${populate-channels} --servers '${machineCertJson}' --username ${config.clan.core.machineName} --db-location ${mumbleDatabasePath} --cert True
${pkgs.mumble}/bin/mumble --config ${mumbleCfgPath}
${pkgs.mumble}/bin/mumble --config ${mumbleCfgPath} "$@"
popd
'';
in

4
clanModules/mumble/mumble-populate-channels.py
View File

@ -206,10 +206,6 @@ if __name__ == "__main__":
if args.ensure_config:
ensure_config(args.ensure_config, args.db_location)
# if args.cert:
# initialize_certificates(args.db_location, args.username, port, args.digest)
# print("Initialized certificates")
# exit(0)
print("Initialized config")
exit(0)