From 91cde865c1bbc43b46da6944606c1c4498d0b314 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Sun, 30 Mar 2025 17:41:35 -0500 Subject: [PATCH 1/2] Use absolute path for now. --- flake.lock | 8 ++++---- flake.nix | 2 +- pkgs/caddy/flake.lock | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 6a22352..99d45eb 100644 --- a/flake.lock +++ b/flake.lock @@ -44,13 +44,13 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1, - "narHash": "sha256-SIKBfviJFGqzP5JJVCW7JRhSqxYKYChMFefASSt9YNU=", - "path": "pkgs/caddy", + "lastModified": 1743373947, + "narHash": "sha256-u0ng3qUqW5J1hBQACbhBkAOlyouY2VVX1AdxrYPOqkI=", + "path": "/etc/nixos/pkgs/caddy", "type": "path" }, "original": { - "path": "pkgs/caddy", + "path": "/etc/nixos/pkgs/caddy", "type": "path" } }, diff --git a/flake.nix b/flake.nix index 2f33bf9..f534cc2 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; agenix.url = "github:ryantm/agenix"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; - caddy.url = "path:pkgs/caddy"; + caddy.url = "path:/etc/nixos/pkgs/caddy"; }; outputs = diff --git a/pkgs/caddy/flake.lock b/pkgs/caddy/flake.lock index c377a1e..1d293bc 100644 --- a/pkgs/caddy/flake.lock +++ b/pkgs/caddy/flake.lock @@ -2,11 +2,11 @@ "nodes": { "caddy": { "locked": { - "lastModified": 1735284852, - "narHash": "sha256-mQu3IwEO294DuB7XAXOvOLriElDgRTf6rTLoDh3tMFQ=", + "lastModified": 1742276417, + "narHash": "sha256-iEGJYhUsjJdxFviduw7zUGdYewf/W7QodEuF1w8MqF0=", "owner": "vincentbernat", "repo": "caddy-nix", - "rev": "b421380ded7c000f432092df0f1a7afd9e187173", + "rev": "f0f28d2b4bd1fd433726e334a462d029f0440baa", "type": "github" }, "original": { @@ -36,8 +36,8 @@ "nixpkgs": { "locked": { "lastModified": 0, - "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", - "path": "/nix/store/50yickar04m51aqnc43gxf45g2i0n3k9-source", + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "path": "/nix/store/sr3gj4wcx3kwy0q5gcxl49ja733bqm7b-source", "type": "path" }, "original": { From f939193442228fffbccbc6aa315516c77a1c36df Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Sun, 30 Mar 2025 17:41:57 -0500 Subject: [PATCH 2/2] Make consumption dir public. --- hosts/hub/apps/paperless.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/hub/apps/paperless.nix b/hosts/hub/apps/paperless.nix index 2e3bd6e..5125bf7 100644 --- a/hosts/hub/apps/paperless.nix +++ b/hosts/hub/apps/paperless.nix @@ -9,7 +9,11 @@ PAPERLESS_OCR_USER_ARGS = { "invalidate_digital_signatures" = true; }; + PAPERLESS_USE_X_FORWARD_HOST = true; + PAPERLESS_USE_X_FORWARD_PORT = true; + PAPERLESS_REDIRECT_LOGIN_TO_SSO = true; }; + consumptionDirIsPublic = true; }; caddy.virtualHosts."paperless.tailc50184.ts.net".extraConfig = ''