From 1e3ee88bbe20fe2c836b1aab884486fbafe25176 Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 20 Oct 2025 06:13:41 +0000 Subject: [PATCH] removed the temporary nginx config and moved it to the infra layer --- clanServices/customer-portal/default.nix | 15 -------- clanServices/zitadel/default.nix | 45 +++++++++++++++--------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/clanServices/customer-portal/default.nix b/clanServices/customer-portal/default.nix index 82c8e20..a2767f2 100644 --- a/clanServices/customer-portal/default.nix +++ b/clanServices/customer-portal/default.nix @@ -32,21 +32,6 @@ in enable = true; openFirewall = true; }; - - services.nginx = { - enable = true; - - virtualHosts = { - "amarth.cloud" = { - enableACME = true; - forceSSL = true; - - locations."/" = { - proxyPass = "http://127.0.0.1:8080"; - }; - }; - }; - }; }; }; }; diff --git a/clanServices/zitadel/default.nix b/clanServices/zitadel/default.nix index 2272569..24bb280 100644 --- a/clanServices/zitadel/default.nix +++ b/clanServices/zitadel/default.nix @@ -38,7 +38,35 @@ in }; perInstance = { instanceName, settings, machine, roles, ... }: { - nixosModule = { config, pkgs, ... }: { + nixosModule = { config, pkgs, inputs, system, ... }: + let + terraform = inputs.terranix.lib.terranixConfiguration { + inherit pkgs system; + + modules = [ + ({ config, ... }: { + config = { + terraform.required_providers.zitadel = { + source = "zitadel/zitadel"; + version = "2.2.0"; + }; + + provider.zitadel = { + domain = "localhost"; + insecure = "true"; + port = "8080"; + jwt_profile_file = "local-token"; + }; + + resource.zitadel_human_user.default = { + org_id = ""; + }; + }; + }) + ]; + }; + in + { clan.core.vars.generators.zitadel = { share = false; @@ -129,21 +157,6 @@ in } ]; }; - - services.nginx = { - enable = true; - - virtualHosts = { - ${settings.hostName} = { - enableACME = true; - forceSSL = true; - - locations."/" = { - proxyPass = "http://127.0.0.1:9092"; - }; - }; - }; - }; }; }; };