diff --git a/privfrontends/caddy-update.yaml b/privfrontends/caddy-update.yaml index ee160b8..43b22e0 100644 --- a/privfrontends/caddy-update.yaml +++ b/privfrontends/caddy-update.yaml @@ -9,6 +9,4 @@ caddy_config: "{{ lookup('template', './templates/Caddyfile.j2') }}" caddy_user: "caddy" caddy_home: "/var/lib/caddy" - caddy_packages: ["github.com/caddy-dns/rfc2136@master"] - # Static weekly builds of caddy with rfc2136 dns plugin - caddy_url_base: "https://cb.projectsegfau.lt/api/download" + caddy_packages: ["github.com/aksdb/caddy-cgi", "github.com/caddy-dns/desec"] diff --git a/privfrontends/templates/Caddyfile.j2 b/privfrontends/templates/Caddyfile.j2 index d6339d7..e87f708 100644 --- a/privfrontends/templates/Caddyfile.j2 +++ b/privfrontends/templates/Caddyfile.j2 @@ -176,11 +176,6 @@ inv.{{ server_prefix }}.projectsegfau.lt i.{{ server_prefix }}.psf.lt { import def header -X-Frame-Options header -Content-Security-Policy - @ratelimit not path /videoplayback/* /ggpht/* /vi/* /videoplayback /videojs/* /css/* /js/* /fonts/* /apple-touch-icon.png /favicon-16x16.png /feed/webhook /feed/webhook/* - rate_limit @ratelimit {remote.ip} 10r/s - rate_limit @ratelimit {remote.ip} 100r/m - @ratelimit_pubsub path /feed/webhook /feed/webhook/* - rate_limit @ratelimit_pubsub {remote.ip} 2r/s 404 log { # This is temporarily required to monitor nitter traffic due to scrapers being more active, so we need to monitor and rate limit them at a later date. output file /var/log/caddy/ratelimiters.log diff --git a/privfrontends/templates/eu/misc.Caddyfile b/privfrontends/templates/eu/misc.Caddyfile index 10a764d..5019d32 100644 --- a/privfrontends/templates/eu/misc.Caddyfile +++ b/privfrontends/templates/eu/misc.Caddyfile @@ -26,11 +26,6 @@ inv.bp.projectsegfau.lt, i.bp.psf.lt, invidious.projectsegfau.lt, inv.projectseg import def header -X-Frame-Options header -Content-Security-Policy - @ratelimit not path /videoplayback/* /ggpht/* /vi/* /videoplayback /videojs/* /css/* /js/* /fonts/* /apple-touch-icon.png /favicon-16x16.png /feed/webhook /feed/webhook/* - rate_limit @ratelimit {remote.ip} 10r/s - rate_limit @ratelimit {remote.ip} 100r/m - @ratelimit_pubsub path /feed/webhook /feed/webhook/* - rate_limit @ratelimit_pubsub {remote.ip} 2r/s 404 log { # This is temporarily required to monitor nitter traffic due to scrapers being more active, so we need to monitor and rate limit them at a later date. output file /var/log/caddy/ratelimiters.log