From c387cd5bb9b99e5c79827f73ed9cd4c7236c50ec Mon Sep 17 00:00:00 2001 From: Ducky Date: Tue, 15 Aug 2023 16:57:38 +0100 Subject: [PATCH] caddy (snippets): fix various issues --- etc/caddy/snippets.caddyfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/etc/caddy/snippets.caddyfile b/etc/caddy/snippets.caddyfile index f4409ed..3e3de19 100644 --- a/etc/caddy/snippets.caddyfile +++ b/etc/caddy/snippets.caddyfile @@ -1,10 +1,13 @@ (app-redir) { - redir https://{args[0]}.zio.sh{uri} temporary + @redirect { + expression `{http.request.host.labels.2} != "{args[0]}"` + } + redir @redirect https://{args[0]}.zio.sh{uri} temporary } (cors) { - @origin header Origin {args.0} - header @origin Access-Control-Allow-Origin "{args.0}" + @origin header Origin {args[0]} + header @origin Access-Control-Allow-Origin "{args[0]}" header @origin Access-Control-Request-Method GET } @@ -12,7 +15,7 @@ @user_home path_regexp user ^/~([^/]+)(/.*)?$ handle @user_home { redir /~{re.user.1} /~{re.user.1}/ permanent - root * {args.0}{re.user.1}/www + root * {args[0]}{re.user.1}/www rewrite * {re.user.2} file_server browse { hide .[A-Za-z]* @@ -30,7 +33,8 @@ Disallow: /" (tls-cf) { tls { - dns cloudflare {args.0} + dns cloudflare {args[0]} resolvers 1.1.1.1 } } +