From 47bc060da7def6aa54faa5e7cb37fda5306c5139 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sat, 31 Jan 2026 10:26:17 +1000 Subject: [PATCH] fix nginx bad root --- flake.lock | 8 ++++---- hosts/hyrule/services/nginx.nix | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8d37b6f..bfa8133 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1769815774, - "narHash": "sha256-77XLfci6EK+zenuJkHuyt8gh0MI2mlJYEPVRPu0Ufcc=", + "lastModified": 1769819040, + "narHash": "sha256-sFtlxsSXGH3BFkM7REuwntmKQ9f1SeDQIqEK8jTdz34=", "ref": "refs/heads/main", - "rev": "c4049313d442538a60edca4aba5e71b963d2bc40", - "revCount": 55, + "rev": "e001182489cea3e4cb2a461eb83a7c163f38b7e7", + "revCount": 56, "type": "git", "url": "https://forge.imbored.dev/emileclarkb/dobutterfliescry.net" }, diff --git a/hosts/hyrule/services/nginx.nix b/hosts/hyrule/services/nginx.nix index d719841..a923245 100644 --- a/hosts/hyrule/services/nginx.nix +++ b/hosts/hyrule/services/nginx.nix @@ -1,9 +1,14 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { nixpkgs.overlays = [ (self: super: { # in wake of CVE-2022-3602/CVE-2022-3786 nginxStable = super.nginxStable.override {openssl = pkgs.libressl;}; }) + inputs.dobutterfliescry-net.overlays.default ]; # simple nginx instance to host static construction page @@ -82,7 +87,8 @@ { default = true; addSSL = true; # not strictly enforced <3 - root = "/var/www/cry"; + # root = "/var/www/cry"; + root = "${pkgs.dobutterfliescry-net}/www"; # extraConfig = '' # error_page 404 /custom_404.html; # '';