diff --git a/templates/conf/Caddyfile.j2 b/templates/conf/Caddyfile.j2 index df3f261..6e2366a 100755 --- a/templates/conf/Caddyfile.j2 +++ b/templates/conf/Caddyfile.j2 @@ -2,7 +2,7 @@ { admin off acme_dns cloudflare {$CLOUDFLARE_API_TOKEN} - order rate_limit before basicauth +# order rate_limit before basicauth } # ---------------------------------------------------------------------------------------------------- @@ -494,8 +494,6 @@ @q host q.{$HOSTNAME} handle @q { encode zstd gzip - rate_limit {remote.ip} 2r/s 60000 429 - rate_limit {remote.ip} 45r/m 300000 429 reverse_proxy { to {{ oracle1_private_ip }}:8904 to {{ oracle2_private_ip }}:8904 @@ -506,7 +504,6 @@ lb_try_interval 1s fail_duration 30s max_fails 3 - header_up X-Real-IP {remote_host} } header { X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow" @@ -588,8 +585,6 @@ @ig host ig.{$HOSTNAME} handle @ig { encode zstd gzip - rate_limit {remote.ip} 2r/s 60000 429 - rate_limit {remote.ip} 45r/m 300000 429 reverse_proxy { to {{ oracle1_private_ip }}:8908 to {{ oracle2_private_ip }}:8908 diff --git a/templates/conf/settings.yml.j2 b/templates/conf/settings.yml.j2 index 945bd6a..f75c035 100755 --- a/templates/conf/settings.yml.j2 +++ b/templates/conf/settings.yml.j2 @@ -232,8 +232,8 @@ hostname_replace: 'dic\.academic\.ru$': 'akademik.bloat.cat' '(.*\.)?tumblr\.com$': 'tb.opnxng.com' '(.*\.)?imgur\.com$': 'r.opnxng.com' -# '(.*\.)?mobile.twitter\.com$': 'nitter.poast.org' -# '(about\www\.)?twitter\.com$': 'nitter.poast.org' + '(.*\.)?mobile.twitter\.com$': 'nitter.poast.org' + '(about\www\.)?twitter\.com$': 'nitter.poast.org' '(.*\.)?quora\.com$': 'q.opnxng.com' '(.*\.)?imdb\.com$': 'd.opnxng.com' # '(.*\.)?instagram\.com$': 'ig.opnxng.com' diff --git a/vars/services.yaml b/vars/services.yaml index aee5abf..4c6f41e 100644 --- a/vars/services.yaml +++ b/vars/services.yaml @@ -1,12 +1,12 @@ -compose: - oracle1: - - redlib - oracle2: - - redlib - oracle3: - - redlib +config: oracle4: - - redlib + - caddy + - paulgo + +compose: + oracle4: + - caddy + - paulgo # ----------------------------------------------------------------------------------------------------