From 4f011328221f6564c0572c69021d63f8ecc42aa4 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 26 Jul 2025 15:14:32 -0400 Subject: [PATCH] change some docs stuff --- clients/quadraticserver/docs.nix | 17 ++++++----------- flake.lock | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/clients/quadraticserver/docs.nix b/clients/quadraticserver/docs.nix index 10b2296..ba62e33 100644 --- a/clients/quadraticserver/docs.nix +++ b/clients/quadraticserver/docs.nix @@ -42,7 +42,6 @@ in { minio = { enable = true; - browser = false; rootCredentialsFile = config.age.secrets."minioCredentials.age".path; }; @@ -50,16 +49,12 @@ in { cfg = config.services.lasuite-docs; in '' handle_errors { - @401 expression {http.error.status_code} == 401 - rewrite @401 /401 - - @403 expression {http.error.status_code} == 403 - rewrite @403 /403 - - @404 expression {http.error.status_code} == 404 - rewrite @404 /404 + rewrite * /{http.error.status_code} + file_server } + redir /api/v1.0/logout/None / + root * ${pkgs.lasuite-docs-frontend} file_server @@ -67,7 +62,6 @@ in { rewrite @uuidDocs /docs/[id]/index.html reverse_proxy /api/* unix/${socket} - reverse_proxy /admin/* unix/${socket} reverse_proxy /collaboration/ws/* http://localhost:${toString cfg.collaborationServer.port} @@ -93,7 +87,8 @@ in { EnvironmentFile = config.age.secrets."minioCredentials.age".path; ExecStart = pkgs.writeShellScript "init-minio" '' mc alias set minio ${s3Domain} "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" --api s3v4 - mc --config-dir "$CONFIG_DIR" mb --ignore-existing minio/lasuite-docs + mc mb --ignore-existing minio/lasuite-docs + mc anonymous get minio/lasuite-docs ''; }; }; diff --git a/flake.lock b/flake.lock index 346c862..52ed068 100644 --- a/flake.lock +++ b/flake.lock @@ -1427,11 +1427,11 @@ ] }, "locked": { - "lastModified": 1753487470, - "narHash": "sha256-cUmvWt+y31DtRY6Mi9UQybZhaP/ooh4jqdMLzcN35Hg=", + "lastModified": 1753538890, + "narHash": "sha256-GadAOR4VJXtYnpunNnjBQqaO2s9BJxD49ui9OmrHdBg=", "ref": "refs/heads/main", - "rev": "957a6c6c97df642866c039ef586d1c52293ad552", - "revCount": 41, + "rev": "a86c8e2b26a6d12eaf6fd74f79111a08fc2768d6", + "revCount": 42, "type": "git", "url": "https://git.federated.nexus/Henry-Hiles/matrixoidc" }, @@ -2244,11 +2244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -2505,11 +2505,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1753433875, - "narHash": "sha256-kwrggwH9zeiLVonO9aA2Wngl/ZAL/1VbJxbBKgyfbXo=", + "lastModified": 1753515282, + "narHash": "sha256-vSihpZor6HFdbUU0pX8MTB1ZLM+XFmhDsFF7S35iIT8=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "79677d017c844fec0511558ee4f96291c85a946e", + "rev": "e2a9f0bb925432018eb1d4bbbd40b1377e42422c", "type": "github" }, "original": {