diff --git a/machines/ramus/think-greater-chiangmai.nix b/machines/ramus/think-greater-chiangmai.nix index 9b3e24c..1c5814d 100644 --- a/machines/ramus/think-greater-chiangmai.nix +++ b/machines/ramus/think-greater-chiangmai.nix @@ -1,8 +1,33 @@ { self, ... }: +let + commonSettings = { + DB_CONNECTION = "mysql"; + DB_HOST = "localhost"; + DB_PORT = 3306; + DB_DATABASE = "thinkgtcm"; + DB_USERNAME = "gtcm"; + }; +in { imports = [ self.nixosModules.think-gtcm self.nixosModules.think-backend-gtcm ]; nixpkgs.overlays = [ self.overlays.packagesOverlay ]; + + services.think-greaterchiangmai = { + enable = true; + domain = "think.greaterchiangmai.com"; + settings = { + + } + // commonSettings; + }; + services.think-backend-greaterchiangmai = { + enable = true; + domain = "think-backend.greaterchiangmai.com"; + settings = { + } + // commonSettings; + }; } diff --git a/modules/nixos/think-gtcm.nix b/modules/nixos/think-gtcm.nix index 0aa7fd1..4db90ce 100644 --- a/modules/nixos/think-gtcm.nix +++ b/modules/nixos/think-gtcm.nix @@ -62,13 +62,6 @@ in description = "Domain to serve on."; }; - backendDomain = lib.mkOption { - type = lib.types.str; - default = "think-backend.greaterchiangmai.com"; - example = "forum.example.com"; - description = "Backend Domain to serve on."; - }; - settings = lib.mkOption { type = with lib.types;