From 8abc2e1afd4f66dce2e383d1aa2db3c3f31ef0fd Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 1 Jan 2025 20:55:56 +0000 Subject: [PATCH] Fix archive page redirect /archive/page/* shouldn't redirect. --- .../modules/caddy/vhosts/www.oliverdavies.uk.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nix/hosts/hetznix/modules/caddy/vhosts/www.oliverdavies.uk.nix b/nix/hosts/hetznix/modules/caddy/vhosts/www.oliverdavies.uk.nix index 775f57c..f8eac49 100644 --- a/nix/hosts/hetznix/modules/caddy/vhosts/www.oliverdavies.uk.nix +++ b/nix/hosts/hetznix/modules/caddy/vhosts/www.oliverdavies.uk.nix @@ -37,10 +37,19 @@ } @articles path_regexp ^/articles/(.*)$ - @old-dailies path_regexp ^/archive/(.*)$ @talks path_regexp ^/talks/(.*)$ @talks-archive path_regexp ^/talks/archive/(.*)$ + # Exclude /daily/page/{number} from the /archive/* redirection + @excludeArchivePages { + path_regexp ^/archive/page/\d+$ + } + + @old-dailies { + path_regexp oldDailies ^/archive/(.*)$ + not path_regexp ^/archive/page/\d+$ + } + redir @articles /blog/{re.1} permanent redir @old-dailies /daily/{re.1} permanent redir @talks-archive /presentations/{re.1} permanent