cluster/services/storage: register existing keys and buckets in incandescence

cluster/services/consul/test.nix

@@ -5,16 +5,15 @@
     start_all()
 
     with subtest("should form cluster"):
-      nodes = [ n for n in machines if n != nowhere ]
+      for machine in machines:
-      for machine in nodes:
         machine.succeed("systemctl start consul-ready.service")
-      for machine in nodes:
+      for machine in machines:
         consulConfig = json.loads(machine.succeed("cat /etc/consul.json"))
         addr = consulConfig["addresses"]["http"]
         port = consulConfig["ports"]["http"]
         setEnv = f"CONSUL_HTTP_ADDR={addr}:{port}"
         memberList = machine.succeed(f"{setEnv} consul members --status=alive")
-        for machine2 in nodes:
+        for machine2 in machines:
           assert machine2.name in memberList
   '';
 }

cluster/services/wireguard/default.nix

@@ -93,9 +93,5 @@ in
       nodes = config.services.wireguard.nodes.mesh;
       shared = false;
     };
-    simulacrum = {
-      enable = true;
-      settings = ./test.nix;
-    };
   };
 }

cluster/services/wireguard/test.nix

@@ -1,26 +0,0 @@
-{ cluster, lib, ... }:
-
-{
-  testScript = ''
-    start_all()
-    ${lib.pipe cluster.config.services.wireguard.nodes.mesh [
-      (map (node: /*python*/ ''
-        ${node}.wait_for_unit("wireguard-wgmesh.target")
-      ''))
-      (lib.concatStringsSep "\n")
-    ]}
-
-    ${lib.pipe cluster.config.services.wireguard.nodes.mesh [
-      (map (node: /*python*/ ''
-        with subtest("${node} can reach all other nodes"):
-          ${lib.pipe (cluster.config.services.wireguard.otherNodes.mesh node) [
-            (map (peer: /*python*/ ''
-              ${node}.succeed("ping -c3 ${cluster.config.hostLinks.${peer}.mesh.extra.meshIp}")
-            ''))
-            (lib.concatStringsSep "\n  ")
-          ]}
-      ''))
-      (lib.concatStringsSep "\n")
-    ]}
-  '';
-}

modules/motd/default.nix

@@ -1,4 +1,4 @@
-{ cluster, config, depot, pkgs, ... }:
+{ config, depot, pkgs, ... }:
 {
   users.motd = builtins.readFile ./motd.txt;
   environment.interactiveShellInit = let
@@ -8,11 +8,6 @@
     grep = exec pkgs.gnugrep "grep";
     countUsers = '' ${util "who"} -q | ${util "head"} -n1 | ${util "tr"} ' ' \\n | ${util "uniq"} | ${util "wc"} -l'';
     countSessions = '' ${util "who"} -q | ${util "head"} -n1 | ${util "wc"} -w'';
-
-    rev = if cluster.config.simulacrum then
-      "simulacrum"
-    else
-      depot.rev or "\${BRED}(✘)\${CO}\${BWHITE} Dirty";
   in ''
     (
     # Reset colors
@@ -45,7 +40,7 @@
     echo -e " █ ''${BGREEN}(✓)''${CO} ''${BWHITE}You are using a genuine Private Void™ system.''${CO}"
     echo    " █"
     echo -e " █ ''${BWHITE}OS Version....:''${CO} NixOS ''${CAB}${config.system.nixos.version}''${CO}" 
-    echo -e " █ ''${BWHITE}Configuration.:''${CO} ''${CAB}${rev}''${CO}" 
+    echo -e " █ ''${BWHITE}Configuration.:''${CO} ''${CAB}${depot.rev or "\${BRED}(✘)\${CO}\${BWHITE} Dirty"}''${CO}" 
     echo -e " █ ''${BWHITE}Uptime........:''${CO} $(${uptime} -p | ${util "cut"} -d ' ' -f2- | GREP_COLORS='mt=01;35' ${grep} --color=always '[0-9]*')"
     echo -e " █ ''${BWHITE}SSH Logins....:''${CO} There are currently ''${CAB}$(${countUsers})''${CO} users logged in on ''${CAB}$(${countSessions})''${CO} sessions"
     )

modules/part.nix

@@ -29,6 +29,7 @@ in
     reflection = ./reflection;
     shell-config = ./shell-config;
     ssh = ./ssh;
+    system-info = ./system-info;
     system-recovery = ./system-recovery;
     systemd-extras = ./systemd-extras;
     tested = ./tested;
@@ -55,6 +56,7 @@ in
       motd
       networking
       nix-config-server
+      system-info
       system-recovery
       tested
     ];

modules/system-info/default.nix

@@ -0,0 +1,5 @@
+{ depot, ... }:
+
+{
+  system.configurationRevision = depot.rev or null;
+}

packages/checks/default.nix

@@ -7,6 +7,7 @@ let
 in
 
 {
+  debug = lib.warn "debug mode is enabled" true;
   perSystem = { filters, pkgs, self', system, ... }: {
     checks = lib.mkIf (system == "x86_64-linux") {
       ascensions = pkgs.callPackage ./ascensions.nix {