From 5fbc7a89e4b920b06bd90db65537d201743c58dd Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Mon, 12 Dec 2022 19:23:03 -0700 Subject: [PATCH] nix&docker: simplify Caddyfile --- .github/docker/Caddyfile | 11 +---------- flake.nix | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.github/docker/Caddyfile b/.github/docker/Caddyfile index 3ac87b587..9d16e2982 100644 --- a/.github/docker/Caddyfile +++ b/.github/docker/Caddyfile @@ -17,14 +17,5 @@ trusted_proxies 172.20.0.0/16 } - @startsWithDot { - path \/\. - not path .well-known - } - rewrite @startsWithDot /index.php{uri} - - @phpRewrite { - not file favicon.ico - } - try_files @phpRewrite {path} {path}/ /index.php?{query} + try_files {path} {path}/ /index.php?{query} } diff --git a/flake.nix b/flake.nix index e046b16b5..6cd595c4e 100644 --- a/flake.nix +++ b/flake.nix @@ -80,16 +80,7 @@ php_fastcgi localhost:9000 - @startsWithDot { - path \/\. - not path .well-known - } - rewrite @startsWithDot /index.php{uri} - - @phpRewrite { - not file favicon.ico - } - try_files @phpRewrite {path} {path}/ /index.php?{query} + try_files {path} {path}/ /index.php?{query} } '';