diff --git a/machines/ramus/think-greater-chiangmai.nix b/machines/ramus/think-greater-chiangmai.nix index bd29e42..019d6d9 100644 --- a/machines/ramus/think-greater-chiangmai.nix +++ b/machines/ramus/think-greater-chiangmai.nix @@ -100,26 +100,11 @@ in services.think-greaterchiangmai = { enable = true; domain = "think.wegetthingsmade.com"; - settings = { - APP_SERVICES_CACHE = "/run/think-gtcm/cache/services.php"; - APP_PACKAGES_CACHE = "/run/think-gtcm/cache/packages.php"; - APP_CONFIG_CACHE = "/run/think-gtcm/cache/config.php"; - APP_ROUTES_CACHE = "/run/think-gtcm/cache/routes-v7.php"; - APP_EVENTS_CACHE = "/run/think-gtcm/cache/events.php"; - } - // commonSettings; + settings = commonSettings; }; services.think-backend-greaterchiangmai = { enable = true; domain = "think-backend.wegetthingsmade.com"; - settings = { - APP_SERVICES_CACHE = "/run/think-backend-gtcm/cache/services.php"; - APP_PACKAGES_CACHE = "/run/think-backend-gtcm/cache/packages.php"; - APP_CONFIG_CACHE = "/run/think-backend-gtcm/cache/config.php"; - APP_ROUTES_CACHE = "/run/think-backend-gtcm/cache/routes-v7.php"; - APP_EVENTS_CACHE = "/run/think-backend-gtcm/cache/events.php"; - - } - // commonSettings; + settings = commonSettings; }; } diff --git a/modules/nixos/think-backend-gtcm.nix b/modules/nixos/think-backend-gtcm.nix index 6af6ab3..a6070ec 100644 --- a/modules/nixos/think-backend-gtcm.nix +++ b/modules/nixos/think-backend-gtcm.nix @@ -148,6 +148,14 @@ in artisan-be ]; + services.think-backend-greaterchiangmai.settings = { + APP_SERVICES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/services.php"; + APP_PACKAGES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/packages.php"; + APP_CONFIG_CACHE = lib.mkDefault "${cfg.dataDir}/cache/config.php"; + APP_ROUTES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/routes-v7.php"; + APP_EVENTS_CACHE = lib.mkDefault "${cfg.dataDir}/cache/events.php"; + }; + systemd.services.think-backend-gtcm-setup = { description = "think-backend.greaterchiangmai installation"; requiredBy = [ "phpfpm-think-backend-gtcm.service" ]; @@ -226,6 +234,7 @@ in systemd.tmpfiles.rules = [ "d ${cfg.dataDir} 0710 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/cache 0700 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/public 0750 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/public/uploads 0750 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -" diff --git a/modules/nixos/think-gtcm.nix b/modules/nixos/think-gtcm.nix index 2030537..8b98247 100644 --- a/modules/nixos/think-gtcm.nix +++ b/modules/nixos/think-gtcm.nix @@ -150,6 +150,14 @@ in artisan ]; + services.think-greaterchiangmai.settings = { + APP_SERVICES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/services.php"; + APP_PACKAGES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/packages.php"; + APP_CONFIG_CACHE = lib.mkDefault "${cfg.dataDir}/cache/config.php"; + APP_ROUTES_CACHE = lib.mkDefault "${cfg.dataDir}/cache/routes-v7.php"; + APP_EVENTS_CACHE = lib.mkDefault "${cfg.dataDir}/cache/events.php"; + }; + systemd.services.think-gtcm-setup = { description = "think.greaterchiangmai installation"; requiredBy = [ "phpfpm-think-gtcm.service" ]; @@ -228,6 +236,7 @@ in systemd.tmpfiles.rules = [ "d ${cfg.dataDir} 0710 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/cache 0700 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/public 0750 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/public/uploads 0750 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -"