.

clanServices/zitadel/default.nix

@@ -21,7 +21,6 @@ in
     };
 
     perInstance = { instanceName, settings, machine, roles, ... }: {
-      # nixosModule = lib.modules.importApply ./roles/controller.nix (instanceArgs // { inherit pkgs; });
       nixosModule = { config, ... }: {
         clan.core.vars.generators.zitadel = {
           share = false;
@@ -43,7 +42,7 @@ in
         services.zitadel = {
           enable = true;
 
-          masterKeyFile = config.clan.core.vars.generators.zitadel.masterKey.path;
+          masterKeyFile = config.clan.core.vars.generators.zitadel.files.masterKey.path;
 
           settings = {
             Port = 9092;
@@ -92,8 +91,8 @@ in
       options = {};
     };
 
-    perInstance = instanceArgs: {
-      nixosModule = lib.modules.importApply ./roles/peer.nix (instanceArgs // { inherit pkgs; });
+    perInstance = { instanceName, settings, machine, roles, ... }: {
+      nixosModule = {}
     };
   };
 }

clanServices/zitadel/flake-module.nix

@@ -6,10 +6,10 @@ in
   clan.modules.zitadel = module;
 
   perSystem = { ... }: {
-    # clan.nixosTests.zitadel = {
-    #   imports = [ ./tests/vm/default.nix ];
+    clan.nixosTests.zitadel = {
+      imports = [ ./tests/vm/default.nix ];
 
-    #   clan.modules."@amarth/zitadel" = module;
-    # };
+      clan.modules."@amarth/zitadel" = module;
+    };
   };
 }

clanServices/zitadel/roles/controller.nix

@@ -1,63 +0,0 @@
-{ instanceName, settings, machine, roles, config, pkgs, ... }: {
-  config = {
-    clan.core.vars.generators = {
-      zitadel = {
-        share = false;
-
-        files.masterKey = { deploy = true; secret = true; };
-        files.initialAdminPassword = { deploy = true; secret = true; };
-
-        runtimeInputs = with pkgs; [ pwgen ];
-
-        script = ''
-          pwgen 50 1 > "$out/initialAdminPassword"
-
-          # https://zitadel.com/docs/self-hosting/manage/configure#masterkey
-          # The master key has to be 32 bytes
-          head -c 32 /dev/urandom > "$out/masterKey"
-        '';
-      };
-    };
-
-    services.zitadel = {
-      enable = true;
-
-      masterKeyFile = config.clan.core.vars.generators.zitadel.masterKey.path;
-
-      settings = {
-        Port = 9092;
-
-        ExternalDomain = "auth.amarth.cloud";
-        ExternalPort = 443;
-        ExternalSecure = true;
-
-        Metrics.Type = "otel";
-        Tracing.Type = "otel";
-        Telemetry.Enabled = true;
-
-        SystemDefaults = {
-          PasswordHasher.Hasher.Algorithm = "argon2id";
-          SecretHasher.Hasher.Algorithm = "argon2id";
-        };
-      };
-
-      steps.FirstInstance = {
-        InstanceName = settings.hostName;
-
-        Org = {
-          Name = settings.displayName;
-          Human = {
-            UserName = "chris";
-            FirstName = "Chris";
-            LastName = "Kruining";
-            Email = {
-              Address = "chris@kruining.eu";
-              Verified = true;
-            };
-            Password = config.clan.core.vars.generators.zitadel.initialAdminPassword.value;
-          };
-        };
-      };
-    };
-  };
-}

clanServices/zitadel/roles/peer.nix

@@ -1,3 +0,0 @@
-{ instanceName, settings, machine, roles, config, ... }: {
-  config = {};
-}

clanServices/zitadel/tests/vm/default.nix

@@ -26,15 +26,15 @@
         };
       };
     };
-
-    nodes = {
-      node1 = {};
-      node2 = {};
-      node3 = {};
-    };
-
-    testScript = ''
-      start_all()
-    '';
   };
+
+  nodes = {
+    node1 = {};
+    node2 = {};
+    node3 = {};
+  };
+
+  testScript = ''
+    start_all()
+  '';
 }