thohlt/archtika
1
0
Fork 0
mirror of https://github.com/thiloho/archtika.git synced 2025-11-22 02:41:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Nix module

Browse Source
This commit is contained in:
thiloho
2025-01-30 00:16:50 +01:00
parent fba3aef8aa
commit c97347e760
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@@ -36,7 +36,7 @@
''; '';
}; };
web = pkgs.mkShell { web = pkgs.mkShell {
packages = with pkgs; [ nodejs_22 ]; packages = with pkgs; [ nodejs ];
shellHook = '' shellHook = ''
export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers} export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}
export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true

22
nix/module.nix
View File

@@ -179,7 +179,7 @@ in
-c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_storage_size\" TO ${toString cfg.settings.maxWebsiteStorageSize}" \ -c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_storage_size\" TO ${toString cfg.settings.maxWebsiteStorageSize}" \
-c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_number_user\" TO ${toString cfg.settings.maxUserWebsites}" -c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_number_user\" TO ${toString cfg.settings.maxUserWebsites}"
${lib.getExe pkgs.dbmate} --url ${dbUrl "postgres"}?sslmode=disable --migrations-dir ${cfg.package}/rest-api/db/migrations up ${lib.getExe pkgs.dbmate} --url "${dbUrl "postgres"}&sslmode=disable" --migrations-dir ${cfg.package}/rest-api/db/migrations up
PGRST_SERVER_CORS_ALLOWED_ORIGINS="https://${cfg.domain}" \ PGRST_SERVER_CORS_ALLOWED_ORIGINS="https://${cfg.domain}" \
PGRST_ADMIN_SERVER_PORT=${toString cfg.apiAdminPort} \ PGRST_ADMIN_SERVER_PORT=${toString cfg.apiAdminPort} \
@@ -216,13 +216,16 @@ in
PORT = toString cfg.webAppPort; PORT = toString cfg.webAppPort;
}; };
script = "${lib.getExe pkgs.nodejs_22} ${cfg.package}/web-app"; script = "${lib.getExe pkgs.nodejs} ${cfg.package}/web-app";
}; };
services.postgresql = { services.postgresql = {
enable = true; enable = true;
ensureDatabases = [ cfg.databaseName ]; ensureDatabases = [ cfg.databaseName ];
extensions = ps: with ps; [ pgjwt ]; extensions = ps: with ps; [ pgjwt ];
authentication = lib.mkOverride 11 ''
local all all trust
'';
}; };
systemd.services.postgresql = { systemd.services.postgresql = {
@@ -243,16 +246,17 @@ in
recommendedZstdSettings = true; recommendedZstdSettings = true;
recommendedOptimisation = true; recommendedOptimisation = true;
appendHttpConfig = ''
map $http_cookie $archtika_auth_header {
default "";
"~*session_token=([^;]+)" "Bearer $1";
}
'';
virtualHosts = { virtualHosts = {
"${cfg.domain}" = { "${cfg.domain}" = {
useACMEHost = cfg.domain; useACMEHost = cfg.domain;
forceSSL = true; forceSSL = true;
extraConfig = ''
map $http_cookie $auth_header {
default "";
"~*session_token=([^;]+)" "Bearer $1";
}
'';
locations = { locations = {
"/" = { "/" = {
proxyPass = "http://127.0.0.1:${toString cfg.webAppPort}"; proxyPass = "http://127.0.0.1:${toString cfg.webAppPort}";
@@ -266,7 +270,7 @@ in
proxyPass = "http://127.0.0.1:${toString cfg.apiPort}/rpc/export_articles_zip"; proxyPass = "http://127.0.0.1:${toString cfg.apiPort}/rpc/export_articles_zip";
extraConfig = '' extraConfig = ''
default_type application/json; default_type application/json;
proxy_set_header Authorization $auth_header; proxy_set_header Authorization $archtika_auth_header;
''; '';
}; };
"/api/" = { "/api/" = {