diff --git a/flake.nix b/flake.nix index c97bb86..2a21e11 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Clan services for use with Amarth Cloud"; + description = "Amarth Cloud's Clan services"; inputs = { clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; @@ -23,14 +23,13 @@ { # inherit (clan.config) nixosConfigurations nixosModules clanInternals; # clan = clan.config; - + imports = [ clan-core.flakeModules.default # ./clanServices/flake-module.nix ]; clan.modules = { - "@amarth/zitadel" = flake-parts.lib.importApply ./modules/service/zitadel/default.nix {}; "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {}; }; @@ -48,4 +47,4 @@ }; }); }; -} +} \ No newline at end of file diff --git a/modules/sercice/zitadel/default.nix b/modules/sercice/zitadel/default.nix deleted file mode 100644 index 028775b..0000000 --- a/modules/sercice/zitadel/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ ... }: -{ - _class = "clan.service"; - - manifest.name = "zitadel"; - - roles = { - controller = { - interface = { - options = {}; - }; - - perInstance = { instanceName, settings, machine, roles, ... }: { - nixosModule = { config }: { - config = { - services.zitadel.steps.${instanceName} = { - InstanceName = settings.hostName; - - Org = { - Name = settings.displayName; - Human = { - UserName = "chris"; - FirstName = "Chris"; - LastName = "Kruining"; - Email = { - Address = "chris@kruining.eu"; - Verified = true; - }; - Password = "KaasIsAwesome1!"; - }; - }; - }; - }; - }; - }; - }; - - peer = {}; - }; - - pweMachine = { instances, machine, ... }: { - nixosModule = { config, ... }: { - config = { - services.zitadel = { - enable = true; - - 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"; - }; - - }; - }; - }; - }; - }; -}