diff --git a/machines/ramus/think-greater-chiangmai.nix b/machines/ramus/think-greater-chiangmai.nix index 9f1ac58..8611131 100644 --- a/machines/ramus/think-greater-chiangmai.nix +++ b/machines/ramus/think-greater-chiangmai.nix @@ -21,6 +21,8 @@ let R2_BUCKET = config.clan.core.vars.generators.greaterchiangmai-s3.files.bucket.value; R2_ENDPOINT = config.clan.core.vars.generators.greaterchiangmai-s3.files.endpoint.value; + R2_BUCKET_NAME = R2_BUCKET; + LOG_CHANNEL = "stack"; LOG_LEVEL = "debug"; diff --git a/modules/nixos/think-backend-gtcm.nix b/modules/nixos/think-backend-gtcm.nix index 76866a9..e9e97e5 100644 --- a/modules/nixos/think-backend-gtcm.nix +++ b/modules/nixos/think-backend-gtcm.nix @@ -171,13 +171,12 @@ in requiredBy = [ "phpfpm-think-backend-gtcm.service" ]; before = [ "phpfpm-think-backend-gtcm.service" ]; serviceConfig = { - user = cfg.user; + User = cfg.user; WorkingDirectory = "${file-uploader}"; + ExecStart = "${lib.getExe pkgs.nodejs_20} ${file-uploader}/src/be/index.js"; + Restart = "on-failure"; }; path = [ pkgs.nodejs_20 ]; - script = '' - node ${file-uploader}/src/be/index.js - ''; }; environment.systemPackages = [ @@ -311,13 +310,12 @@ in "~ \\.(js|css|gif|png|ico|jpg|jpeg)$" = { extraConfig = "expires 365d;"; }; - - "/initiate-multiplart-upload".extraConfig = nginxNodeProxyConfig; - "/get-presigned-url".extraConfig = nginxNodeProxyConfig; - "/complete-multipart-upload".extraConfig = nginxNodeProxyConfig; - "/generate-presigned-url".extraConfig = nginxNodeProxyConfig; - "/enable-bucket-cors".extraConfig = nginxNodeProxyConfig; - "/upload".extraConfig = nginxNodeProxyConfig; + "^~ /initiate-multipart-upload".extraConfig = nginxNodeProxyConfig; + "^~ /get-presigned-url".extraConfig = nginxNodeProxyConfig; + "^~ /complete-multipart-upload".extraConfig = nginxNodeProxyConfig; + "^~ /generate-presigned-url".extraConfig = nginxNodeProxyConfig; + "^~ /enable-bucket-cors".extraConfig = nginxNodeProxyConfig; + "^~ /upload".extraConfig = nginxNodeProxyConfig; }; }; };