From b0de95fd28dfb8a0227d48c217b567d1340fa6ea Mon Sep 17 00:00:00 2001 From: kurogeek Date: Thu, 20 Nov 2025 15:26:14 +0700 Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci] lastFile:modules/nixos/think-gtcm.nix --- modules/nixos/flake-module.nix | 3 +++ modules/nixos/think-gtcm.nix | 2 +- tests/default.nix | 7 +++---- tests/tests/think-gtcm.nix | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/nixos/flake-module.nix b/modules/nixos/flake-module.nix index b8a1ffc..2f56f14 100644 --- a/modules/nixos/flake-module.nix +++ b/modules/nixos/flake-module.nix @@ -3,5 +3,8 @@ common = { imports = [ ./common.nix ]; }; + think-gtcm = { + imports = [ ./think-gtcm.nix ]; + }; }; } diff --git a/modules/nixos/think-gtcm.nix b/modules/nixos/think-gtcm.nix index 82ef2e3..49a47f8 100644 --- a/modules/nixos/think-gtcm.nix +++ b/modules/nixos/think-gtcm.nix @@ -218,7 +218,7 @@ in services.nginx = { enable = true; virtualHosts."${cfg.domain}" = { - root = "${cfg.stateDir}/public"; + root = "${cfg.package}/public"; locations."~ \\.php$".extraConfig = '' fastcgi_pass unix:${config.services.phpfpm.pools.think-greaterchiangmai.socket}; fastcgi_index site.php; diff --git a/tests/default.nix b/tests/default.nix index 89a6595..8770e48 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -1,13 +1,12 @@ -{ ... }: +{ self, ... }: { perSystem = - { pkgs, self', ... }: + { pkgs, ... }: { checks = let checkArgs = { - inherit pkgs; - self = self'; + inherit pkgs self; }; in { diff --git a/tests/tests/think-gtcm.nix b/tests/tests/think-gtcm.nix index 34c7f4d..1e1bd19 100644 --- a/tests/tests/think-gtcm.nix +++ b/tests/tests/think-gtcm.nix @@ -5,7 +5,7 @@ node1 = { self, pkgs, ... }: { - imports = [ ]; + imports = [ self.nixosModules.think-gtcm ]; services.think-greaterchiangmai = { enable = true; };