tests: Refactor keys

tests/overlay/default.nix

@@ -7,23 +7,15 @@
     { config, ... }:
     {
       users.users.seb.openssh.authorizedKeys.keyFiles = lib.mkIf config.custom.services.sshd.enable [
-        ./keys/server-ssh.pub
-        ./keys/client1-ssh.pub
-        ./keys/client2-ssh.pub
+        ./keys/server/ssh.pub
+        ./keys/client1/ssh.pub
+        ./keys/client2/ssh.pub
       ];
 
-      environment.etc."ssh-key" = lib.mkIf (lib.pathExists ./keys/${config.networking.hostName}-ssh) {
-        source = ./keys/${config.networking.hostName}-ssh;
+      environment.etc."ssh-key" = lib.mkIf (lib.pathExists ./keys/${config.networking.hostName}/ssh) {
+        source = ./keys/${config.networking.hostName}/ssh;
         mode = "0600";
       };
-
-      custom.services.nebula = {
-        caCertificateFile = ./keys/ca.crt;
-        certificateFile = ./keys/${config.networking.hostName}.crt;
-        privateKeyFile = ./keys/${config.networking.hostName}.key;
-      };
-
-      networking.extraHosts = lib.mkForce "";
     };
 
   nodes = {

tests/syncthing/default.nix

@@ -6,21 +6,11 @@
   defaults =
     { config, ... }:
     {
-      custom = {
-        services = {
-          nebula = {
-            caCertificateFile = ./keys/nebula/ca.crt;
-            certificateFile = ./keys/nebula/${config.networking.hostName}.crt;
-            privateKeyFile = ./keys/nebula/${config.networking.hostName}.key;
-          };
-
-          syncthing = {
-            enable = true;
-            deviceId = ./keys/syncthing/${config.networking.hostName}.id |> lib.readFile |> lib.trim;
-            certFile = ./keys/syncthing/${config.networking.hostName}.cert;
-            keyFile = ./keys/syncthing/${config.networking.hostName}.key;
-          };
-        };
+      custom.services.syncthing = {
+        enable = true;
+        deviceId = ./keys/${config.networking.hostName}/syncthing.id |> lib.readFile |> lib.trim;
+        certFile = ./keys/${config.networking.hostName}/syncthing.cert;
+        keyFile = ./keys/${config.networking.hostName}/syncthing.key;
       };
     };