diff --git a/modules/nixos/think-backend-gtcm.nix b/modules/nixos/think-backend-gtcm.nix index 8d71ebc..fc142d5 100644 --- a/modules/nixos/think-backend-gtcm.nix +++ b/modules/nixos/think-backend-gtcm.nix @@ -7,7 +7,7 @@ let cfg = config.services.think-backend-greaterchiangmai; think-backend-gtcm = pkgs.think-backend-gtcm.override { dataDir = cfg.dataDir; }; - file-uploader = pkgs.file-uploader.override { dataDir = cfg.dataDir; }; + file-uploader = pkgs.gtcm-file-uploader.override { dataDir = cfg.dataDir; }; nginxNodeProxyConfig = '' proxy_pass http://127.0.0.1:3000; @@ -166,6 +166,17 @@ in ''; }; + systemd.services.gtcm-file-uploader = { + description = "File upload service for think-backend.greaterchiangmai.com"; + requiredBy = [ "phpfpm-think-backend-gtcm.service" ]; + before = [ "phpfpm-think-backend-gtcm.service" ]; + serviceConfig = { + user = cfg.user; + }; + path = [ pkgs.nodejs20 ]; + script = ''''; + }; + environment.systemPackages = [ artisan-be ]; @@ -269,7 +280,7 @@ in "d ${cfg.dataDir}/storage/logs 0700 ${cfg.user} ${cfg.group} - -" "d ${cfg.dataDir}/storage/uploads 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/file-uploader/uploads 0700 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/gtcm-file-uploader/uploads 0700 ${cfg.user} ${cfg.group} - -" ]; networking.firewall.allowedTCPPorts = [ diff --git a/pkgs/file-uploader.nix b/pkgs/gtcm-file-uploader.nix similarity index 82% rename from pkgs/file-uploader.nix rename to pkgs/gtcm-file-uploader.nix index 59e6322..5c1a955 100644 --- a/pkgs/file-uploader.nix +++ b/pkgs/gtcm-file-uploader.nix @@ -2,7 +2,7 @@ fetchgit, buildNpmPackage, pkgs, - dataDir ? "/var/lib/file-uploader", + dataDir ? "/var/lib/gtcm-file-uploader", }: let repoSrc = fetchgit { @@ -13,7 +13,7 @@ let src = "${repoSrc}/upload-large-file"; in buildNpmPackage { - pname = "file-uploader"; + pname = "gtcm-file-uploader"; version = "1.0.0"; nativeBuildInputs = with pkgs; [ @@ -34,7 +34,7 @@ buildNpmPackage { mkdir -p $out cp -r * $out ln -s ${dataDir}/.env $out/.env - ln -s ${dataDir}/file-uploader/uploads $out/src/be/uploads + ln -s ${dataDir}/gtcm-file-uploader/uploads $out/src/be/uploads runHook postInstall ''; } diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index f3fa663..9b2f14f 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -1,5 +1,5 @@ final: prev: { think-gtcm = final.callPackage ./think-gtcm.nix { }; think-backend-gtcm = final.callPackage ./think-backend-gtcm.nix { php = final.php83; }; - file-uploader = final.callPackage ./file-uploader.nix { }; + gtcm-file-uploader = final.callPackage ./file-uploader.nix { }; }