From 99324bb8350854949699bfce3d470b0de9df9636 Mon Sep 17 00:00:00 2001 From: c15412 <70379135+c15412@users.noreply.github.com> Date: Thu, 5 Sep 2024 10:44:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E9=83=A8=E5=88=86=E4=B8=8A?= =?UTF-8?q?=E6=B8=B8=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/Discord.conf | 70 ++++++++++++++----- conf/E-hentai.conf | 29 ++------ conf/GV.conf | 10 +-- conf/GoogleVideo.conf | 7 +- conf/PayPal.conf | 4 +- conf/Pixiv.conf | 152 ++++++++++++++++++++---------------------- conf/Proxy.conf | 8 +++ conf/Reddit.conf | 5 +- conf/Steam.conf | 72 +++++--------------- conf/Twitch.conf | 63 ++++++++--------- conf/Twitter.params | 6 +- conf/WallHaven.conf | 14 ++-- conf/instagram.conf | 15 ++--- conf/iwaras.conf | 5 +- conf/nginx.conf | 2 +- 15 files changed, 204 insertions(+), 258 deletions(-) create mode 100644 conf/Proxy.conf diff --git a/conf/Discord.conf b/conf/Discord.conf index 6d97bdd..c5ba0ba 100644 --- a/conf/Discord.conf +++ b/conf/Discord.conf @@ -5,6 +5,15 @@ upstream DiscordApp-com { server 162.159.133.233:443; server 162.159.134.233:443; server 162.159.135.233:443; + server [2606:4700::162.159.129.233]:443; + server [2606:4700::162.159.130.233]:443; + server [2606:4700::162.159.133.233]:443; + server [2606:4700::162.159.134.233]:443; + server [2606:4700::162.159.135.233]:443; + keepalive 16; + keepalive_time 1h; + keepalive_timeout 120; + keepalive_requests 10000; } server { @@ -29,11 +38,13 @@ server { server_name pax.discordapp.com; include cert.conf; - + #access_log logs/Discord-access.log main buffer=4k; + access_log off; + error_log logs/Discord-error.log; location / { proxy_pass https://DiscordApp-com/; - include proxy.params; + include Proxy.conf; } } @@ -43,6 +54,15 @@ upstream Discord-com { server 162.159.137.232:443; server 162.159.138.232:443; server 162.159.128.233:443; + server [2606:4700::162.159.128.232]:443; + server [2606:4700::162.159.135.232]:443; + server [2606:4700::162.159.136.232]:443; + server [2606:4700::162.159.137.232]:443; + server [2606:4700::162.159.138.232]:443; + keepalive 16; + keepalive_time 1h; + keepalive_timeout 120; + keepalive_requests 10000; } server { @@ -61,6 +81,9 @@ server { server_name i18n.discord.com; include cert.conf; + #access_log logs/Discord-access.log main buffer=4k; + access_log off; + error_log logs/Discord-error.log; location / { proxy_pass https://Discord-com/; @@ -72,7 +95,7 @@ server { proxy_buffers 4 256k; proxy_busy_buffers_size 256k; proxy_set_header Cookie $http_cookie; - include proxy.params; + include Proxy.conf; } } @@ -82,10 +105,15 @@ upstream Discord-gg { server 162.159.134.234:443; server 162.159.135.234:443; server 162.159.126.234:443; - keepalive 32; + server [2606:4700::162.159.130.234]:443; + server [2606:4700::162.159.133.234]:443; + server [2606:4700::162.159.134.234]:443; + server [2606:4700::162.159.135.234]:443; + server [2606:4700::162.159.126.234]:443; + keepalive 8; keepalive_time 1h; keepalive_timeout 60s; - keepalive_requests 64; + keepalive_requests 1000; } server { @@ -96,6 +124,9 @@ server { server_name gateway-us-east1-b.discord.gg; include cert.conf; + #access_log logs/Discord-access.log main buffer=4k; + access_log off; + error_log logs/Discord-error.log; location / { proxy_pass https://Discord-gg/; @@ -119,10 +150,13 @@ server { server_name support-dev.discord.com; include cert.conf; + #access_log logs/Discord-access.log main buffer=4k; + access_log off; + error_log logs/Discord-error.log; location / { proxy_pass https://support-Discord-com/; - include proxy.params; + include Proxy.conf; } } @@ -132,6 +166,11 @@ upstream dl-discordapp-net { server 162.159.133.232:443; server 162.159.134.232:443; server 162.159.128.233:443; + server [2606:4700::162.159.128.233]:443; + server [2606:4700::162.159.129.232]:443; + server [2606:4700::162.159.130.232]:443; + server [2606:4700::162.159.133.232]:443; + server [2606:4700::162.159.134.232]:443; } server { @@ -140,21 +179,16 @@ server { server_name dl.discordapp.net; include cert.conf; + #access_log logs/Discord-access.log main buffer=4k; + access_log off; + error_log logs/Discord-error.log; location / { proxy_pass https://dl-discordapp-net/; - include proxy.params; + include Proxy.conf; } } -upstream media-discordapp-net { - server 162.159.128.232:443; - server 162.159.129.232:443; - server 162.159.130.232:443; - server 162.159.133.232:443; - server 162.159.134.232:443; -} - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -163,9 +197,12 @@ server { server_name images-ext-1.discordapp.net; include cert.conf; + #access_log logs/Discord-access.log main buffer=4k; + access_log off; + error_log logs/Discord-error.log; location / { - proxy_pass https://media-discordapp-net/; + proxy_pass https://dl-discordapp-net/; proxy_http_version 1.1; proxy_set_header Host media.discordapp.net; proxy_set_header User-Agent $http_user_agent; @@ -174,5 +211,4 @@ server { proxy_buffering off; } } - # Discord End \ No newline at end of file diff --git a/conf/E-hentai.conf b/conf/E-hentai.conf index be30463..ef7cd71 100644 --- a/conf/E-hentai.conf +++ b/conf/E-hentai.conf @@ -24,13 +24,8 @@ server { location / { proxy_pass https://exhentai-lb/; - keepalive_timeout 120; - proxy_set_header Connection ""; proxy_next_upstream_timeout 75; - proxy_connect_timeout 10; - proxy_send_timeout 5; - proxy_read_timeout 5; - include proxy.params; + include Proxy.conf; } } @@ -59,11 +54,8 @@ server { location / { proxy_pass https://e-hentai-lb/; - proxy_set_header Connection ""; proxy_next_upstream_timeout 100; - proxy_connect_timeout 10; - keepalive_timeout 120; - include proxy.params; + include Proxy.conf; } } @@ -83,9 +75,7 @@ server { location / { proxy_pass https://94.100.18.243:443/; - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + include Proxy.conf; } } @@ -109,9 +99,7 @@ server { location / { proxy_pass https://api-e-hentai-lb/; - proxy_set_header Connection ""; - proxy_connect_timeout 10; - include proxy.params; + include proxy.conf; } } @@ -137,9 +125,7 @@ server { fastcgi_send_timeout 3000; fastcgi_read_timeout 3000; proxy_pass https://upload-e-hentai-lb/; - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + include proxy.conf; } } @@ -167,10 +153,7 @@ server { location / { proxy_pass https://ehgt-org/; - proxy_set_header Connection ""; - proxy_connect_timeout 2; - keepalive_timeout 120; - include proxy.params; + include Proxy.conf; } } # E-Hentai End \ No newline at end of file diff --git a/conf/GV.conf b/conf/GV.conf index 18d91dd..0ea9588 100644 --- a/conf/GV.conf +++ b/conf/GV.conf @@ -1,19 +1,13 @@ proxy_max_temp_file_size 0; -keepalive_timeout 120s; -keepalive_requests 30000; -#limit_rate_after 1M; -limit_rate 2M; +keepalive_requests 10000; resolver 119.29.29.29:53 valid=1h ipv4=off ipv6=on; if ( $http_host ~ (([\S\s]*).googlevideo.com) ){ proxy_pass https://$2.${domain_SUFFIX}:443; #$2是匹配上的变量部分 } - -proxy_set_header Connection ""; -proxy_connect_timeout 5; proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; -include proxy.params; +include proxy.conf; #access_log logs/GoogleVideo-access.log GoogleVideo buffer=4k gzip=4; access_log off; diff --git a/conf/GoogleVideo.conf b/conf/GoogleVideo.conf index 7ab9ff7..a7d474f 100644 --- a/conf/GoogleVideo.conf +++ b/conf/GoogleVideo.conf @@ -119,14 +119,12 @@ server { include cert.conf; location / { proxy_max_temp_file_size 0; - keepalive_timeout 120; #resolver [::1]:53 valid=180s ipv4=off ipv6=on; proxy_pass https://Google-Video; - proxy_next_upstream_timeout 60; proxy_set_header X-Host $host; proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; - include proxy.params; + include Proxy.conf; proxy_ssl_name $host; } } @@ -149,10 +147,9 @@ server { include cert.conf; location / { proxy_max_temp_file_size 0; - keepalive_timeout 120; proxy_pass https://ggpht-com; proxy_next_upstream_timeout 30; - include proxy.params; + include proxy.conf; proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; } diff --git a/conf/PayPal.conf b/conf/PayPal.conf index b77d337..05812f5 100644 --- a/conf/PayPal.conf +++ b/conf/PayPal.conf @@ -10,7 +10,7 @@ server { location / { set $checkout_paypal d37t8d3i48djc7.cloudfront.net; proxy_pass https://$checkout_paypal:443/; - include proxy.params; + include Proxy.conf; } } @@ -24,7 +24,7 @@ server { location / { set $c_paypal c-fastly.glb.paypal.com; proxy_pass https://$c_paypal:443/; - include proxy.params; + include Proxy.conf; } } # PayPal End \ No newline at end of file diff --git a/conf/Pixiv.conf b/conf/Pixiv.conf index 2bf3cf1..ef6df63 100644 --- a/conf/Pixiv.conf +++ b/conf/Pixiv.conf @@ -33,9 +33,6 @@ upstream sketch-pixiv-net { server 210.140.174.37:443; server 210.140.170.179:443; server 210.140.175.130:443; - keepalive 16; - keepalive_timeout 120; - keepalive_requests 10000; } upstream sketch-hls-server { @@ -54,7 +51,6 @@ upstream imgaz-pixiv-net { server 210.140.131.153:443; } - upstream i-pximg-net { server 210.140.92.141:443; server 210.140.92.142:443; @@ -86,7 +82,6 @@ upstream fanbox-cc { server 210.140.92.185:443; server 210.140.92.186:443; server 210.140.92.187:443; - keepalive 16; keepalive_timeout 120; keepalive_requests 10000; @@ -98,6 +93,37 @@ upstream app-api-pixiv-net { server 210.140.131.226:443; } +upstream AkamaiCDN { + server 184.27.185.73:443; + server 184.27.185.76:443; + server 184.26.43.79:443; + server 184.26.43.80:443; + server 184.26.91.162:443; + server 184.26.91.47:443; + server 23.48.201.10:443; + server 23.48.201.16:443; + server 23.48.201.33:443; + server 23.48.201.34:443; + server 23.49.104.47:443; + server 23.49.104.48:443; + server 23.49.104.197:443; + server 23.49.104.200:443; + server 23.49.104.201:443; + server 23.49.104.202:443; + server 23.202.34.90:443; + server 23.202.34.91:443; + server 23.202.34.120:443; + server 23.202.34.250:443; + server 23.202.35.57:443; + server 23.202.35.90:443; + server 23.202.35.120:443; + server 23.202.35.250:443; + keepalive 16; + keepalive_time 1h; + keepalive_timeout 120; + keepalive_requests 10000; +} + # default_server Start server { listen 80 default_server; @@ -119,11 +145,7 @@ server { location / { proxy_pass https://www-pixiv-net; - proxy_connect_timeout 4; - - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + include Proxy.conf; } } @@ -145,11 +167,7 @@ server { location / { proxy_pass https://account-pixiv-net/; - proxy_connect_timeout 4; - - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + include Proxy.conf; } } @@ -169,7 +187,7 @@ server { location / { proxy_pass https://ssl-pixiv-net; - include proxy.params; + include Proxy.conf; } } @@ -182,16 +200,10 @@ server { location / { proxy_pass https://i-pximg-net; - keepalive_timeout 120; - proxy_set_header Connection ""; + include Proxy.conf; proxy_next_upstream_timeout 60; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; proxy_set_header Referer "https://www.pixiv.net/"; proxy_set_header Sec-Fetch-Site "cross-site"; - - include proxy.params; allow all; } } @@ -206,11 +218,7 @@ server { location / { proxy_pass https://fanbox-cc/; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; - allow all; + include Proxy.conf; } } @@ -223,10 +231,7 @@ server { location / { proxy_pass https://sketch-pixiv-net; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + include Proxy.conf; } # Proxying WebSockets @@ -235,7 +240,6 @@ server { include proxy.params; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; - #proxy_set_header Host $host; } } @@ -248,7 +252,7 @@ server { location / { proxy_pass https://sketch-hls-server; - include proxy.params; + include Proxy.conf; } } @@ -268,10 +272,7 @@ server { location / { proxy_pass https://imgaz-pixiv-net; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + include Proxy.conf; } } # Pixiv End @@ -279,9 +280,11 @@ server { # Wiki Start upstream wikipedia-text-lb { server 208.80.153.224:443; - #server 208.80.154.224:443; - server 91.198.174.192:443; - #server 103.102.166.224:443; + server 185.15.58.224:443; + server [2620:0:863:ed1a::1]:443; + server [2620:0:861:ed1a::1]:443; + server [2620:0:860:ed1a::1]:443; + server [2001:df2:e500:ed1a::1]:443; } server { @@ -289,33 +292,25 @@ server { listen [::]:443 ssl http2; server_name *.wikipedia.org; server_name *.m.wikipedia.org; - - include cert.conf; - - location / { - proxy_pass https://wikipedia-text-lb/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; server_name wikimedia.org; + server_name *.wikimedia.org; + server_name *.m.wikimedia.org; include cert.conf; location / { proxy_pass https://wikipedia-text-lb/; - include proxy.params; + include Proxy.conf; } } upstream wikipedia-upload-lb { server 208.80.153.240:443; server 208.80.154.240:443; - server 91.198.174.208:443; - server 103.102.166.240:443; + server [2620:0:863:ed1a::2:b]:443; + server [2620:0:861:ed1a::2:b]:443; + server [2620:0:860:ed1a::2:b]:443; + server [2001:df2:e500:ed1a::2:b]:443; } server { @@ -327,7 +322,7 @@ server { location / { proxy_pass https://wikipedia-upload-lb/; - include proxy.params; + include Proxy.conf; } } # Wiki End @@ -343,7 +338,7 @@ server { location / { proxy_pass https://104.153.64.122:443/; - include proxy.params; + include Proxy.conf; } } # archiveofourown End @@ -358,7 +353,7 @@ server { location / { proxy_pass https://198.251.89.38:443/; - include proxy.params; + include Proxy.conf; } } @@ -372,7 +367,7 @@ server { location / { proxy_pass https://185.178.208.182:443/; - include proxy.params; + include Proxy.conf; } } # Nyaa End @@ -389,25 +384,29 @@ upstream githubusercontent-com { server 185.199.108.133:443; server 185.199.110.133:443; server 185.199.111.133:443; - server 146.75.112.113:443; + server 146.75.112.133:443; server 146.75.20.133:443; server 151.101.64.133:443; server 151.101.76.133:443; - server 151.101.108.133:443; + #server 151.101.108.133:443; server 151.101.128.133:443; server 151.101.192.133:443; - server 151.101.228.133:443; + #server 151.101.228.133:443; server 199.232.208.133:443; server 199.232.212.133:443; server 199.232.232.133:443; + server [2a04:4e42:75::133]:443; + server [2a04:4e42:76::133]:443; + server [2a04:4e42:82::133]:443; + server [2a04:4e42:8c::133]:443; + server [2a04:4e42:4d::133]:443; + server [2a04:4e42:4c::133]:443; + server [2a04:4e42:12::133]:443; server [2a04:4e42:15::133]:443; server [2a04:4e42:1a::133]:443; server [2a04:4e42:36::133]:443; server [2a04:4e42:48::133]:443; - server [2a04:4e42:75::133]:443; - server [2a04:4e42:76::133]:443; - server [2a04:4e42:8c::133]:443; } server { @@ -420,14 +419,11 @@ server { location / { proxy_pass https://Github-com/; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; + include Proxy.conf; proxy_headers_hash_max_size 8192; proxy_buffer_size 128k; proxy_buffers 4 256k; proxy_busy_buffers_size 256k; - include proxy.params; } } @@ -444,13 +440,9 @@ server { location / { proxy_pass https://githubusercontent-com/; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; - proxy_next_upstream_timeout 32; + include Proxy.conf; proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; - include proxy.params; } } # github End @@ -472,8 +464,8 @@ server { include cert.conf; location / { - proxy_pass https://steamstatic-akamai/; - include proxy.params; + proxy_pass https://AkamaiCDN/; + include Proxy.conf; } } @@ -487,7 +479,7 @@ server { location / { set $rewrite_host "api2.origin.com"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } @@ -501,7 +493,7 @@ server { location / { set $rewrite_host "e8688.e12.akamaiedge.net"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } -# EA End +# EA End \ No newline at end of file diff --git a/conf/Proxy.conf b/conf/Proxy.conf new file mode 100644 index 0000000..32c9f9f --- /dev/null +++ b/conf/Proxy.conf @@ -0,0 +1,8 @@ +proxy_connect_timeout 5; +proxy_set_header Connection ''; +proxy_http_version 1.1; +proxy_set_header Host $http_host; +proxy_set_header User-Agent $http_user_agent; +proxy_set_header Accept-Encoding ''; +proxy_buffering off; +proxy_ssl_server_name on; \ No newline at end of file diff --git a/conf/Reddit.conf b/conf/Reddit.conf index 0ce2d38..bf784f7 100644 --- a/conf/Reddit.conf +++ b/conf/Reddit.conf @@ -38,15 +38,12 @@ server { keepalive_requests 4000; proxy_pass https://Reddit/; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; proxy_next_upstream error timeout http_429 http_500 http_502 http_503 http_504 non_idempotent; - include proxy.params; + include proxy.conf; } } # Reddit End \ No newline at end of file diff --git a/conf/Steam.conf b/conf/Steam.conf index fc59e82..ebff498 100644 --- a/conf/Steam.conf +++ b/conf/Steam.conf @@ -1,23 +1,22 @@ upstream steam-store { - server 104.71.48.121:443 max_fails=5 fail_timeout=60s; + #server 184.24.82.108:443 max_fails=5 fail_timeout=60s;#HighPing #server 23.1.179.144:443 max_fails=5 fail_timeout=60s;#HighPing - #server 23.45.56.78:443 max_fails=5 fail_timeout=60s;#HighPing - server 184.24.82.108:443 max_fails=5 fail_timeout=60s; + #server 23.195.152.91:443 max_fails=5 fail_timeout=60s;#HighPing + server 104.71.48.121:443 max_fails=5 fail_timeout=60s; + server 23.45.56.78:443 max_fails=5 fail_timeout=60s; server 184.85.112.102:443 max_fails=5 fail_timeout=60s; server 184.87.103.42:443 max_fails=5 fail_timeout=60s; server 23.77.215.46:443 max_fails=5 fail_timeout=60s;# server 23.51.142.168:443 max_fails=5 fail_timeout=60s;# server 23.41.77.6:443 max_fails=5 fail_timeout=60s;# - #server 23.36.106.129:443 max_fails=5 fail_timeout=60s;#HighPing - #server 23.36.252.78:443 max_fails=5 fail_timeout=60s;#HighPing + server 23.36.106.129:443 max_fails=5 fail_timeout=60s;#HighPing + server 23.36.252.78:443 max_fails=5 fail_timeout=60s;#HighPing server 23.208.81.63:443 max_fails=5 fail_timeout=60s;# server 23.200.148.81:443 max_fails=5 fail_timeout=60s;# server 23.200.152.81:443 max_fails=5 fail_timeout=60s;# server 23.219.73.99:443 max_fails=5 fail_timeout=60s;# server 23.211.57.127:443 max_fails=5 fail_timeout=60s;# server 23.219.69.47:443 max_fails=5 fail_timeout=60s;# - #server 23.195.152.91:443 max_fails=5 fail_timeout=60s;#HighPing - server 23.198.37.119:443 max_fails=5 fail_timeout=60s;# server 23.48.229.101:443 max_fails=5 fail_timeout=60s;# keepalive 16; keepalive_time 1h; @@ -57,9 +56,7 @@ server { proxy_pass https://steam-community/; proxy_next_upstream_timeout 60; - proxy_connect_timeout 6; - include proxy.params; - + include Proxy.conf; } } @@ -83,42 +80,11 @@ server { proxy_pass https://steam-store/; proxy_next_upstream error timeout http_403 http_429 http_500 http_502 http_503 http_504 non_idempotent; proxy_next_upstream_timeout 90; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + include Proxy.conf; #proxy_ssl_name $http_host; } } -upstream steamstatic-akamai { - server 184.27.185.73:443; - server 184.27.185.76:443; - server 184.26.43.79:443; - server 184.26.43.80:443; - server 184.26.91.162:443; - server 184.26.91.47:443; - server 23.48.201.10:443; - server 23.48.201.16:443; - server 23.48.201.33:443; - server 23.48.201.34:443; - server 23.49.104.197:443; - server 23.49.104.200:443; - server 23.49.104.201:443; - server 23.49.104.202:443; - server 23.202.34.90:443; - server 23.202.34.91:443; - server 23.202.34.120:443; - server 23.202.34.250:443; - server 23.202.35.57:443; - server 23.202.35.90:443; - server 23.202.35.120:443; - server 23.202.35.250:443; - keepalive 16; - keepalive_time 1h; - keepalive_timeout 120; - keepalive_requests 10000; -} server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -129,7 +95,7 @@ server { include cert.conf; location / { - proxy_pass https://steamstatic-akamai; + proxy_pass https://AkamaiCDN; proxy_http_version 1.1; proxy_next_upstream_timeout 60; proxy_connect_timeout 5; @@ -158,12 +124,10 @@ server { location / { #set $rewrite_host "${http_host}.edgesuite.net"; + resolver public1.alidns.com valid=300 ipv4=on ipv6=off; #proxy_pass https://$rewrite_host; - proxy_pass https://steamstatic-akamai; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + proxy_pass https://AkamaiCDN; + include Proxy.conf; proxy_ssl_name $http_host; access_log off; error_log logs/SteamCDN-error.log; @@ -248,7 +212,6 @@ server { set $rewrite_host "video.steamstatic.com.edgesuite.net"; resolver public1.alidns.com valid=300 ipv4=on ipv6=off; proxy_pass https://$rewrite_host; - proxy_http_version 1.1; proxy_connect_timeout 5; keepalive_timeout 120; @@ -272,13 +235,10 @@ server { include cert.conf; location / { - #set $rewrite_host "${http_host}.edgesuite.net"; - proxy_pass https://steamstatic-akamai; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; - - include proxy.params; + set $rewrite_host "${http_host}.edgesuite.net"; + resolver public1.alidns.com valid=300 ipv4=on ipv6=off; + proxy_pass https://AkamaiCDN; + include Proxy.conf; #proxy_ssl_name $source_host; access_log off; error_log logs/SteamCDN-error.log; diff --git a/conf/Twitch.conf b/conf/Twitch.conf index 4669185..f2fe385 100644 --- a/conf/Twitch.conf +++ b/conf/Twitch.conf @@ -6,7 +6,6 @@ upstream twitch-tv { server 151.101.194.167:443; server 151.101.230.167:443; # server twitch.map.fastly.net:443; - } server { @@ -27,8 +26,7 @@ server { location / { set $twitch_tv twitch.map.fastly.net; proxy_pass https://$twitch_tv/; - - include proxy.params; + include Proxy.conf; } } @@ -42,7 +40,7 @@ server { location / { set $rewrite_host "5a895ed07aed1b254ee21cd78958ae0b.steam302.xyz"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } @@ -70,7 +68,7 @@ server { location / { set $vod_storyboards dlifex0fg7ru9.cloudfront.net; proxy_pass https://$vod_storyboards:443/; - include proxy.params; + include Proxy.conf; } } @@ -84,7 +82,7 @@ server { location / { set $vod_metro d8t045al7vai0.cloudfront.net; proxy_pass https://$vod_metro:443/; - include proxy.params; + include Proxy.conf; } } @@ -98,7 +96,7 @@ server { location / { set $music_twitch_tv d12b3e89c9703p.cloudfront.net; proxy_pass https://$music_twitch_tv:443/; - include proxy.params; + include Proxy.conf; } } @@ -112,7 +110,7 @@ server { location / { set $player_m7g_twitch dnjmu7cm5xw9w.cloudfront.net; proxy_pass https://$player_m7g_twitch:443/; - include proxy.params; + include Proxy.conf; } } @@ -126,8 +124,7 @@ server { location / { set $rewrite_host "dbc180c27b3635f9e5b006f3a037b87e.steam302.xyz"; proxy_pass https://$rewrite_host/; - - include proxy.params; + include Proxy.conf; } } @@ -155,7 +152,7 @@ server { location / { set $blog_twitch d1x43om3304ey9.cloudfront.net; proxy_pass https://$blog_twitch:443/; - include proxy.params; + include Proxy.conf; } } @@ -167,10 +164,9 @@ server { include cert.conf; location / { - resolver 9.9.9.12 valid=60; set $panels_twitch_tv d1ut6fykkt3imt.cloudfront.net; proxy_pass https://$panels_twitch_tv:443/; - include proxy.params; + include Proxy.conf; } } @@ -184,7 +180,7 @@ server { location / { set $dev_twitch_tv d205b01qzi0xib.cloudfront.net; proxy_pass https://$dev_twitch_tv:443/; - include proxy.params; + include Proxy.conf; } } @@ -198,7 +194,7 @@ server { location / { set $spade_twitch_tv science-edge-external-prod-73889260.us-west-2.elb.amazonaws.com; proxy_pass https://$spade_twitch_tv/; - include proxy.params; + include Proxy.conf; } } @@ -212,7 +208,7 @@ server { location / { set $vod_secure_twitch_tv ds0h3roq6wcgc.cloudfront.net; proxy_pass https://$vod_secure_twitch_tv/; - include proxy.params; + include Proxy.conf; } } @@ -226,7 +222,7 @@ server { location / { set $trowel_twitch_tv science-edge-external-prod-73889260.us-west-2.elb.amazonaws.com; proxy_pass https://$trowel_twitch_tv/; - include proxy.params; + include Proxy.conf; } } @@ -240,7 +236,7 @@ server { location / { set $extension_files_twitch d36mepituis1gg.cloudfront.net; proxy_pass https://$extension_files_twitch:443/; - include proxy.params; + include Proxy.conf; } } @@ -254,7 +250,7 @@ server { location / { set $help_twitch_tv e26428.dscx.akamaiedge.net; proxy_pass https://$help_twitch_tv:443/; - include proxy.params; + include Proxy.conf; } } @@ -268,7 +264,7 @@ server { location / { set $brand_twitch d2g064yykcu7rs.cloudfront.net; proxy_pass https://$brand_twitch:443/; - include proxy.params; + include Proxy.conf; } } @@ -282,11 +278,10 @@ server { location / { set $rewrite_host "c3ad68a16f66bff24e2d82595bd240a1.steam302.xyz"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -297,7 +292,7 @@ server { location / { set $rewrite_host "2973c6ca0e111662ed293b57dbae9fbf.steam302.xyz"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } @@ -311,8 +306,7 @@ server { location / { set $rewrite_host "985a89155dd090eacda1b82388e334ed.steam302.xyz"; proxy_pass https://$rewrite_host/; - - include proxy.params; + include Proxy.conf; } } @@ -335,7 +329,7 @@ server { location / { proxy_pass https://id--cdn-twitch-tv/; - include proxy.params; + include Proxy.conf; } } @@ -358,7 +352,7 @@ server { location / { proxy_pass https://pubsub--edge-twitch-tv/; - include proxy.params; + include Proxy.conf; } } @@ -372,7 +366,7 @@ server { location / { set $rewrite_host "6d859be7aa0440f65c8a940ef5218337.steam302.xyz"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } @@ -386,7 +380,7 @@ server { location / { set $rewrite_host "522c432cc10e237a02fa1d6481d7d247.steam302.xyz"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } @@ -400,11 +394,10 @@ server { location / { set $rewrite_host "b3d696173d52b66e1caab6145cb5058b.steam302.xyz"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } - server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -415,7 +408,7 @@ server { location / { set $rewrite_host "usher.steam302.xyz"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } @@ -429,7 +422,7 @@ server { location / { set $cvp_twitch e9221.i.akamaiedge.net; proxy_pass https://$cvp_twitch:443/; - include proxy.params; + include Proxy.conf; } } @@ -443,7 +436,7 @@ server { location / { set $clips_media_twitch d2xmjdvx03ij56.cloudfront.net; proxy_pass https://$clips_media_twitch:443/; - include proxy.params; + include Proxy.conf; } } @@ -457,7 +450,7 @@ server { location / { set $safety_twitch e28790.dsca.akamaiedge.net; proxy_pass https://$safety_twitch:443/; - include proxy.params; + include Proxy.conf; } } # Twitch End \ No newline at end of file diff --git a/conf/Twitter.params b/conf/Twitter.params index b5647b6..e699fdc 100644 --- a/conf/Twitter.params +++ b/conf/Twitter.params @@ -4,8 +4,4 @@ proxy_headers_hash_max_size 8192; proxy_buffer_size 128k; proxy_buffers 4 256k; proxy_busy_buffers_size 256k; - -proxy_connect_timeout 5; -keepalive_timeout 120; -proxy_set_header Connection ""; -include proxy.params; \ No newline at end of file +include Proxy.conf; \ No newline at end of file diff --git a/conf/WallHaven.conf b/conf/WallHaven.conf index ca7b61a..bea031b 100644 --- a/conf/WallHaven.conf +++ b/conf/WallHaven.conf @@ -1,12 +1,6 @@ # WallHaven Start - - upstream WallHaven-cc { server 15.235.80.145:443; - keepalive 16; - keepalive_time 1h; - keepalive_timeout 300s; - keepalive_requests 10000; } server { @@ -28,10 +22,10 @@ server { proxy_buffer_size 64k; proxy_buffers 32 64k; proxy_busy_buffers_size 128k; - - keepalive_timeout 120; - proxy_set_header Connection ""; - include proxy.params; + #proxy_set_header X-Host $host; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_set_header X-Real_IP $remote_addr; + include Proxy.conf; } } # WallHaven End \ No newline at end of file diff --git a/conf/instagram.conf b/conf/instagram.conf index 0499c00..01fc08e 100644 --- a/conf/instagram.conf +++ b/conf/instagram.conf @@ -32,7 +32,8 @@ server { listen [::]:443 ssl http2; server_name edge-chat.instagram.com; - access_log logs/Instagram-access.log main buffer=4k; + #access_log logs/Instagram-access.log main buffer=4k; + access_log off; error_log logs/Instagram-error.log; include cert.conf; @@ -49,7 +50,8 @@ server { listen [::]:443 ssl http2; server_name gateway.instagram.com; - access_log logs/Instagram-access.log main buffer=4k; + #access_log logs/Instagram-access.log main buffer=4k; + access_log off; error_log logs/Instagram-error.log; include cert.conf; @@ -72,20 +74,17 @@ server { server_name Instagram.com; server_name *.Instagram.com; - access_log logs/Instagram-access.log main buffer=4k; + #access_log logs/Instagram-access.log main buffer=4k; + access_log off; error_log logs/Instagram-error.log; include cert.conf; location / { proxy_pass https://list-cdn-ins/; - proxy_connect_timeout 5; - keepalive_timeout 120; - proxy_set_header Connection ""; proxy_next_upstream error timeout http_429 http_500 http_502 http_503 http_504 non_idempotent; proxy_buffer_size 128k; proxy_buffers 16 32k; proxy_busy_buffers_size 128k; - include proxy.params; - + include Proxy.conf; } } \ No newline at end of file diff --git a/conf/iwaras.conf b/conf/iwaras.conf index 6069071..2c71938 100644 --- a/conf/iwaras.conf +++ b/conf/iwaras.conf @@ -2,11 +2,8 @@ access_log logs/iwara-access.gzip main gzip=4 buffer=4k; error_log logs/iwara-error.log; proxy_next_upstream_timeout 12; -proxy_connect_timeout 3; -proxy_send_timeout 3; -proxy_read_timeout 3; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Real_IP $remote_addr; -include proxy.params; +include proxy.conf; proxy_ssl_name $http_host; diff --git a/conf/nginx.conf b/conf/nginx.conf index 50308d1..de0da60 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,7 @@ events { } http { - resolver 223.6.6.6; + resolver 119.29.29.29 valid=300s; resolver_timeout 10s; #include mime.types; #default_type application/octet-stream;