From 0ea7d5fe0e1e4b8714a09987ccf3c2a8993c217f Mon Sep 17 00:00:00 2001 From: c15412 <70379135+c15412@users.noreply.github.com> Date: Sat, 14 Sep 2024 18:46:59 +0800 Subject: [PATCH] 2024.09.14 (#73) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add files via upload Update the upstream of Steam, Pixiv, E-hentai Add Server : Discord (IPv4) Instagram (IPv6 Only, Local DNS rewrite required to rewrite all subdomains) WallHaven (IPv4, image CDN Only, excluding pages) Reddit (IPv4, Local DNS rewrite required to rewrite all subdomains) Twitter (IPv4, Local DNS rewrite required to rewrite all subdomains) Twitch (IPv4, Local DNS And DoH were required to rewrite all subdomains) GoogleCDN (File Server IPv6 Only, website pages and IPv4 servers were not included, Local DNS rewrite required to rewrite all subdomains) * Update the self-signed certificate config self-signed certificate * Update README.md * 更换NGINX版本 * 配置文件（2024年08月31日18时11分 配置文件（2024年08月31日18时11分 １、更新部分上游服务器 ２、改进KeepAlive参数，提升访问可靠性 * 改进部分上游服务器写法，避免了可能导致"not signaled for 5s"停止的问题 * 改进部分上游服务器写法 * Update the domains * 增加FaceBook反向代理 配置文件（2024年09月14日14时00分 １、修复部分上游服务器 ２、新增FaceBook反向代理（仅IPv6，需要本地dns进行批量dns重写 * 删除非windows使用的文件夹，现在conf文件夹多端通用，nginx版本大于18即可 删除非windows使用的文件夹，现在conf文件夹多端通用，nginx版本大于18即可 * 更新子证书内容，以支持FaceBook 更新子证书内容，以支持FaceBook * Delete facebook * Delete conf/Reddit.conf * Delete conf/Twitch.conf * Delete conf/Twitter.conf * Delete conf/instagram.conf * Delete conf/Twitter.params * Delete conf/Twitch.params * Delete conf/Discord.conf --- conf/Discord.conf | 178 ------- conf/E-hentai.conf | 29 +- conf/GV.conf | 10 +- conf/GoogleVideo.conf | 7 +- conf/PayPal.conf | 4 +- conf/Pixiv.conf | 161 +++--- conf/Proxy.conf | 8 + conf/Reddit.conf | 52 -- conf/Steam.conf | 71 +-- conf/Twitch.conf | 463 ------------------ conf/Twitch.params | 2 - conf/Twitter.conf | 285 ----------- conf/Twitter.params | 11 - conf/WallHaven.conf | 14 +- conf/instagram.conf | 91 ---- conf/iwaras.conf | 5 +- conf/nginx.conf | 3 +- 自签证书傻瓜式批处理包/config_childCA.txt | 238 ++++----- 配置文件（非Windows用户使用）/ca.cer | Bin 976 -> 0 bytes .../ca/pixiv.net.crt | 93 ---- .../ca/pixiv.net.key | 27 - 配置文件（非Windows用户使用）/hosts | 130 ----- 配置文件（非Windows用户使用）/nginx.conf | 253 ---------- 23 files changed, 237 insertions(+), 1898 deletions(-) delete mode 100644 conf/Discord.conf create mode 100644 conf/Proxy.conf delete mode 100644 conf/Reddit.conf delete mode 100644 conf/Twitch.conf delete mode 100644 conf/Twitch.params delete mode 100644 conf/Twitter.conf delete mode 100644 conf/Twitter.params delete mode 100644 conf/instagram.conf delete mode 100644 配置文件（非Windows用户使用）/ca.cer delete mode 100644 配置文件（非Windows用户使用）/ca/pixiv.net.crt delete mode 100644 配置文件（非Windows用户使用）/ca/pixiv.net.key delete mode 100644 配置文件（非Windows用户使用）/hosts delete mode 100644 配置文件（非Windows用户使用）/nginx.conf diff --git a/conf/Discord.conf b/conf/Discord.conf deleted file mode 100644 index 6d97bdd..0000000 --- a/conf/Discord.conf +++ /dev/null @@ -1,178 +0,0 @@ -# Discord Start -upstream DiscordApp-com { - server 162.159.129.233:443; - server 162.159.130.233:443; - server 162.159.133.233:443; - server 162.159.134.233:443; - server 162.159.135.233:443; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name discordapp.com; - server_name url9177.discordapp.com; - server_name canary-api.discordapp.com; - server_name cdn-ptb.discordapp.com; - server_name ptb.discordapp.com; - server_name status.discordapp.com; - server_name cdn-canary.discordapp.com; - server_name cdn.discordapp.com; - server_name streamkit.discordapp.com; - server_name i18n.discordapp.com; - server_name url9624.discordapp.com; - server_name url7195.discordapp.com; - server_name merch.discordapp.com; - server_name printer.discordapp.com; - server_name canary.discordapp.com; - server_name apps.discordapp.com; - server_name pax.discordapp.com; - - include cert.conf; - - - location / { - proxy_pass https://DiscordApp-com/; - include proxy.params; - } -} - -upstream Discord-com { - server 162.159.135.232:443; - server 162.159.136.232:443; - server 162.159.137.232:443; - server 162.159.138.232:443; - server 162.159.128.233:443; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name discord.com; - server_name status.discord.com; - server_name streamkit.discord.com; - server_name feedback.discord.com; - server_name click.discord.com; - server_name pax.discord.com; - server_name printer.discord.com; - server_name ptb.discord.com; - server_name canary.discord.com; - server_name bugs.discord.com; - server_name i18n.discord.com; - - include cert.conf; - - location / { - proxy_pass https://Discord-com/; - tcp_nodelay on; - #proxy_set_header Upgrade $http_upgrade; - #proxy_set_header Connection "Upgrade"; - proxy_headers_hash_max_size 8192; - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; - proxy_set_header Cookie $http_cookie; - include proxy.params; - } -} - -upstream Discord-gg { - server 162.159.130.234:443; - server 162.159.133.234:443; - server 162.159.134.234:443; - server 162.159.135.234:443; - server 162.159.126.234:443; - keepalive 32; - keepalive_time 1h; - keepalive_timeout 60s; - keepalive_requests 64; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name discord.gg; - server_name gateway.discord.gg; - server_name gateway-us-east1-b.discord.gg; - - include cert.conf; - - location / { - proxy_pass https://Discord-gg/; - tcp_nodelay on; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - include proxy.params; - } -} - -upstream support-Discord-com { - server 104.16.51.111:443; - server 104.16.53.111:443; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name support.discord.com; - server_name safety.discord.com; - server_name support-dev.discord.com; - - include cert.conf; - - location / { - proxy_pass https://support-Discord-com/; - include proxy.params; - } -} - -upstream dl-discordapp-net { - 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 162.159.128.233:443; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name dl.discordapp.net; - - include cert.conf; - - location / { - proxy_pass https://dl-discordapp-net/; - include proxy.params; - } -} - -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; - server_name media.discordapp.net; - server_name images-ext-2.discordapp.net; - server_name images-ext-1.discordapp.net; - - include cert.conf; - - location / { - proxy_pass https://media-discordapp-net/; - proxy_http_version 1.1; - proxy_set_header Host media.discordapp.net; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_ssl_server_name on; - 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..b2db9d3 100644 --- a/conf/Pixiv.conf +++ b/conf/Pixiv.conf @@ -2,7 +2,7 @@ upstream www-pixiv-net { server 210.140.131.181:443; server 210.140.131.183:443; server 210.140.131.185:443; - server 210.140.131.119:443; + server 210.140.131.219:443; server 210.140.131.220:443; server 210.140.131.222:443; server 210.140.131.223:443; @@ -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,25 +440,14 @@ 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 # EA Start -#upstream Origin-CDN { -# server cctv4-lh.akamaihd.net:443; -# server moviesok-i.akamaihd.net:443; -# server vluki-a.akamaihd.net:443; -# server hgtv-i.akamaihd.net:443; -# server toots-a.akamaihd.net:443; -#} server { listen 443 ssl http2; @@ -472,8 +457,8 @@ server { include cert.conf; location / { - proxy_pass https://steamstatic-akamai/; - include proxy.params; + proxy_pass https://AkamaiCDN/; + include Proxy.conf; } } @@ -487,7 +472,7 @@ server { location / { set $rewrite_host "api2.origin.com"; proxy_pass https://$rewrite_host/; - include proxy.params; + include Proxy.conf; } } @@ -501,7 +486,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 deleted file mode 100644 index 0ce2d38..0000000 --- a/conf/Reddit.conf +++ /dev/null @@ -1,52 +0,0 @@ -# Reddit Start - -upstream Reddit { - server 146.75.21.140:443; - server 151.101.77.140:443; - server 151.101.89.140:443; - server 151.101.109.140:443; - #server 151.101.133.140:443; - ##级差为4个/24段，即为/22 - - keepalive 16; - keepalive_time 1h; - keepalive_timeout 300s; - keepalive_requests 4000; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name reddit.com; - server_name *.reddit.com; - server_name redd.it; - server_name *.redd.it; - server_name redditstatic.com; - server_name *.redditstatic.com; - server_name redditmedia.com; - server_name *.redditmedia.com; - - include cert.conf; - access_log logs/Reddit-access.log main buffer=4k; - error_log nul; - - location / { - proxy_max_temp_file_size 0; - proxy_buffer_size 64k; - proxy_buffers 32 64k; - proxy_busy_buffers_size 128k; - 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; - } -} -# Reddit End \ No newline at end of file diff --git a/conf/Steam.conf b/conf/Steam.conf index fc59e82..1fe9a84 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; @@ -159,11 +125,8 @@ server { location / { #set $rewrite_host "${http_host}.edgesuite.net"; #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 +211,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 +234,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 deleted file mode 100644 index 4669185..0000000 --- a/conf/Twitch.conf +++ /dev/null @@ -1,463 +0,0 @@ -# Twitch Start -upstream twitch-tv { - server 151.101.2.167:443; - server 151.101.66.167:443; - server 151.101.130.167:443; - server 151.101.194.167:443; - server 151.101.230.167:443; -# server twitch.map.fastly.net:443; - -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name twitch.tv; - server_name www.twitch.tv; - server_name m.twitch.tv; - server_name app.twitch.tv; - server_name clips.twitch.tv; - server_name gql.twitch.tv; - server_name dashboard.twitch.tv; - server_name player.twitch.tv; - server_name api.twitch.tv; - - include cert.conf; - - location / { - set $twitch_tv twitch.map.fastly.net; - proxy_pass https://$twitch_tv/; - - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name irc-ws.chat.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "5a895ed07aed1b254ee21cd78958ae0b.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name irc-ws-r.chat.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "065f67277ae87878fffaa60519b3ee5c.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name vod-storyboards.twitch.tv; - - include cert.conf; - - location / { - set $vod_storyboards dlifex0fg7ru9.cloudfront.net; - proxy_pass https://$vod_storyboards:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name vod-metro.twitch.tv; - - include cert.conf; - - location / { - set $vod_metro d8t045al7vai0.cloudfront.net; - proxy_pass https://$vod_metro:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name music.twitch.tv; - - include cert.conf; - - location / { - set $music_twitch_tv d12b3e89c9703p.cloudfront.net; - proxy_pass https://$music_twitch_tv:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name player.m7g.twitch.tv; - - include cert.conf; - - location / { - set $player_m7g_twitch dnjmu7cm5xw9w.cloudfront.net; - proxy_pass https://$player_m7g_twitch:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name badges.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "dbc180c27b3635f9e5b006f3a037b87e.steam302.xyz"; - proxy_pass https://$rewrite_host/; - - include proxy.params; - } -} - -upstream d1x43om3304ey9-cloudfront-net { - server 13.225.103.12:443; - server 13.225.103.89:443; - server 13.225.103.105:443; - server 13.225.103.124:443; - server [2600:9000:2200:8a00:2:b70:2c40:93a1]:443; - server [2600:9000:2200:5000:2:b70:2c40:93a1]:443; - server [2600:9000:2200:b400:2:b70:2c40:93a1]:443; - server [2600:9000:2200:7600:2:b70:2c40:93a1]:443; - server [2600:9000:2200:2800:2:b70:2c40:93a1]:443; - server [2600:9000:2200:2400:2:b70:2c40:93a1]:443; - server [2600:9000:2200:2200:2:b70:2c40:93a1]:443; - server [2600:9000:2200:e600:2:b70:2c40:93a1]:443; -} -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name blog.twitch.tv; - - include cert.conf; - - location / { - set $blog_twitch d1x43om3304ey9.cloudfront.net; - proxy_pass https://$blog_twitch:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name panels.twitch.tv; - - 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; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name dev.twitch.tv; - - include cert.conf; - - location / { - set $dev_twitch_tv d205b01qzi0xib.cloudfront.net; - proxy_pass https://$dev_twitch_tv:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name spade.twitch.tv; - - include cert.conf; - - 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; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name vod-secure.twitch.tv; - - include cert.conf; - - location / { - set $vod_secure_twitch_tv ds0h3roq6wcgc.cloudfront.net; - proxy_pass https://$vod_secure_twitch_tv/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name trowel.twitch.tv; - - include cert.conf; - - 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; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name extension-files.twitch.tv; - - include cert.conf; - - location / { - set $extension_files_twitch d36mepituis1gg.cloudfront.net; - proxy_pass https://$extension_files_twitch:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name help.twitch.tv; - - include cert.conf; - - location / { - set $help_twitch_tv e26428.dscx.akamaiedge.net; - proxy_pass https://$help_twitch_tv:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name brand.twitch.tv; - - include cert.conf; - - location / { - set $brand_twitch d2g064yykcu7rs.cloudfront.net; - proxy_pass https://$brand_twitch:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name passport.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "c3ad68a16f66bff24e2d82595bd240a1.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name id.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "2973c6ca0e111662ed293b57dbae9fbf.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name link.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "985a89155dd090eacda1b82388e334ed.steam302.xyz"; - proxy_pass https://$rewrite_host/; - - include proxy.params; - } -} - -upstream id--cdn-twitch-tv { - server 13.224.167.13:443; - server 13.224.167.21:443; - server 13.224.167.82:443; - server 13.224.167.126:443; - server 108.138.246.32:443; - server 108.138.246.23:443; - server 108.138.246.47:443; - server 108.138.246.101:443; -} -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name id-cdn.twitch.tv; - - include cert.conf; - - location / { - proxy_pass https://id--cdn-twitch-tv/; - include proxy.params; - } -} - -upstream pubsub--edge-twitch-tv { - server 54.186.8.237:443; - server 100.20.215.79:443; - server 35.82.206.220:443; - server 54.69.59.28:443; - server 54.188.166.247:443; - server 34.213.206.213:443; - server 54.184.104.163:443; - server 34.213.26.113:443; -} -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name pubsub-edge.twitch.tv; - - include cert.conf; - - location / { - proxy_pass https://pubsub--edge-twitch-tv/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name assets.help.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "6d859be7aa0440f65c8a940ef5218337.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name discuss.dev.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "522c432cc10e237a02fa1d6481d7d247.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name ingest.twitch.tv; - - include cert.conf; - - location / { - set $rewrite_host "b3d696173d52b66e1caab6145cb5058b.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name usher.ttvnw.net; - - include cert.conf; - - location / { - set $rewrite_host "usher.steam302.xyz"; - proxy_pass https://$rewrite_host/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name cvp.twitch.tv; - - include cert.conf; - - location / { - set $cvp_twitch e9221.i.akamaiedge.net; - proxy_pass https://$cvp_twitch:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name clips-media-assets2.twitch.tv; - - include cert.conf; - - location / { - set $clips_media_twitch d2xmjdvx03ij56.cloudfront.net; - proxy_pass https://$clips_media_twitch:443/; - include proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name safety.twitch.tv; - - include cert.conf; - - location / { - set $safety_twitch e28790.dsca.akamaiedge.net; - proxy_pass https://$safety_twitch:443/; - include proxy.params; - } -} -# Twitch End \ No newline at end of file diff --git a/conf/Twitch.params b/conf/Twitch.params deleted file mode 100644 index 6d486df..0000000 --- a/conf/Twitch.params +++ /dev/null @@ -1,2 +0,0 @@ -proxy_http_version 1.1; -include proxy.params; \ No newline at end of file diff --git a/conf/Twitter.conf b/conf/Twitter.conf deleted file mode 100644 index 1faeff6..0000000 --- a/conf/Twitter.conf +++ /dev/null @@ -1,285 +0,0 @@ -# twitter Start -upstream twitter-com { - #server 104.244.42.1:443; - #server 104.244.42.13:443; - #server 104.244.42.14:443; - #server 104.244.42.78:443; - #server 104.244.42.141:443; - #server 104.244.42.142:443; - #server 104.244.42.206:443; - #server 104.244.42.1:443; - #server 104.244.42.65:443; - #server 104.244.42.129:443; - #server 104.244.42.193:443; - server 104.244.45.65:443; - ##server 104.244.45.129:443; - server 104.244.45.193:443; - server 69.195.169.139:443; - server 69.195.170.139:443; - server 69.195.183.139:443; - server 69.195.171.251:443; - server 69.195.171.252:443; - keepalive 16; - keepalive_time 1h; - keepalive_timeout 300s; - keepalive_requests 10000; -} - -upstream mobile-twitter-com { - #server 104.244.42.6:443; - #server 104.244.42.70:443; - #server 104.244.42.134:443; - #server 104.244.42.198:443; - server 104.244.45.6:443; -} - -upstream support-twitter-com { - #server 104.244.42.3:443; - #server 104.244.42.67:443; - #server 104.244.42.131:443; - #server 104.244.42.195:443; - server 104.244.45.3:443; -} -upstream syndication-twitter-com { - server 104.244.45.8:443; -} - -upstream upload-twitter-com { - server 69.195.171.253:443; - server 104.244.45.11:443; -} - -upstream api-twitter-com { - #server 104.244.41.1:443; - #server 104.244.41.2:443; - #server 104.244.41.3:443; - #server 104.244.41.67:443; - #server 104.244.41.66:443; - #server 104.244.41.65:443; - #server 104.244.41.131:443; - #server 104.244.41.130:443; - #server 104.244.41.129:443; - #server 104.244.41.193:443; - #server 104.244.41.194:443; - #server 104.244.41.195:443; - #server 104.244.42.2:443; - #server 104.244.42.66:443; - #server 104.244.42.130:443; - #server 104.244.42.194:443; - server 104.244.45.2:443; - ##server 104.244.45.66:443; - ##server 104.244.45.130:443; - server 104.244.45.194:443; - keepalive 16; - keepalive_time 1h; - keepalive_timeout 600s; - keepalive_requests 10000; -} - -upstream ton-twitter-com { - server 104.244.42.20:443; - server 104.244.42.84:443; - server 104.244.42.148:443; - server 104.244.42.212:443; - server 104.244.45.8:443; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name twitter.com; - server_name x.com; - server_name *.x.com; - server_name *.twitter.com; - - include cert.conf; - location / { - proxy_pass https://twitter-com/; - include Twitter.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name platform.twitter.com; - server_name platform.x.com; - - include cert.conf; - location / { - set $platform_twitter platform.twitter.map.fastly.net; - proxy_pass https://$platform_twitter:443/; - include Twitter.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name upload.twitter.com; - server_name upload.x.com; - - include cert.conf; - location / { - proxy_pass https://upload-twitter-com/; - include Twitter.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name ton.twitter.com; - server_name ton.x.com; - - include cert.conf; - location / { - proxy_pass https://ton-twitter-com/; - include Twitter.params ; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name api.twitter.com; - server_name api.x.com; - - include cert.conf; - location / { - proxy_pass https://api-twitter-com/; - tcp_nodelay on; - proxy_set_header Cookie $http_cookie; - proxy_set_header Upgrade $http_upgrade; - include Twitter.params ; - } -} - -upstream twimg-com { - #server 104.244.42.201:443; - #server 104.244.43.131:443; - server 146.75.20.157:443; - server 146.75.20.158:443; - server 146.75.20.159:443; - server 146.75.20.160:443; - server 146.75.112.157:443; - server 146.75.112.158:443; - server 146.75.112.159:443; - server 146.75.112.160:443; - server 151.101.64.157:443; - server 151.101.64.158:443; - server 151.101.64.159:443; - server 151.101.64.160:443; - server 151.101.76.157:443; - server 151.101.76.158:443; - #server 151.101.76.159:443; - server 151.101.76.160:443; - server 151.101.88.157:443; - server 151.101.88.158:443; - server 151.101.88.159:443; - server 151.101.88.160:443; - #server 151.101.108.157:443; - server 151.101.108.158:443; - server 151.101.108.160:443; - server 151.101.112.157:443; - server 151.101.112.158:443; - server 151.101.112.159:443; - server 151.101.112.160:443; - server 151.101.128.157:443; - server 151.101.128.158:443; - server 151.101.128.159:443; - server 151.101.128.160:443; - server 151.101.192.157:443; - server 151.101.192.158:443; - server 151.101.192.159:443; - server 151.101.192.160:443; - server 199.232.208.157:443; - server 199.232.208.158:443; - server 199.232.208.159:443; - server 199.232.208.160:443; - server 199.232.212.157:443; - server 199.232.212.158:443; - server 199.232.212.159:443; - server 199.232.212.160:443; - server 199.232.232.157:443; - server 199.232.232.158:443; - server 199.232.232.159:443; - server 199.232.232.160:443; - keepalive 16; - keepalive_time 1h; - keepalive_timeout 120; - keepalive_requests 1000; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name *.twimg.com; - - include cert.conf; - location / { - proxy_pass https://twimg-com/; - include Twitter.params; - } -} - -upstream video-twimg-com { - #server 117.18.232.102:443; - server 146.75.48.157:443; - server 146.75.48.158:443; - server 146.75.48.159:443; - server 146.75.48.160:443; - #server 151.101.108.157:443; - server 151.101.108.158:443; - server 151.101.108.160:443; - server 167.82.84.158:443; - server 192.229.232.217:443; - server 192.229.210.163:443; - server 199.232.44.157:443; - server 199.232.100.159:443; - server 199.232.104.160:443; - server 199.232.236.158:443; - server [2a04:4e42:1a::157]:443; - server [2a04:4e42:1a::158]:443; - server [2a04:4e42:1a::159]:443; - server [2a04:4e42:1a::160]:443; - server [2606:2800:247:22e4:1f0b:18b4:207d:15b0]:443; - server [2606:2800:21f:dc2:1fe1:23fc:954:1461]:443; -} - -upstream t-co { - #server 104.244.45.150:443; - server 104.244.45.5:443; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name t.co; - - include cert.conf; - location / { - proxy_pass https://t-co/; - include Twitter.params; - } -} - -upstream jf-x-com { - server 35.155.77.250:443; - server 52.33.255.168:443; - server 44.240.80.13:443; - server 35.160.104.26:443; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name jf.x.com; - - include cert.conf; - location / { - proxy_pass https://jf-x-com/; - include Twitter.params; - } -} -# twitter End \ No newline at end of file diff --git a/conf/Twitter.params b/conf/Twitter.params deleted file mode 100644 index b5647b6..0000000 --- a/conf/Twitter.params +++ /dev/null @@ -1,11 +0,0 @@ -access_log logs/Twitter-access.log main buffer=4k; -error_log logs/Twitter-error.log; -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 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 deleted file mode 100644 index 0499c00..0000000 --- a/conf/instagram.conf +++ /dev/null @@ -1,91 +0,0 @@ -#upstream instagram-com { -# server [2a03:2880:f25e:1e4:face:b00c:0:4420]:443; -#} -upstream list-cdn-ins { - #故障，弃用　server [2a03:2880:f25a:cc:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#香港hkt1 - #故障，弃用　server [2a03:2880:f25a:1c2:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#香港hkt2 - server [2a03:2880:f25e:1e4:face:b00c:0:4420]:443 max_fails=10 fail_timeout=60s;#不明香港服务器但可用 - server [2a03:2880:f215:c3:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#香港hkg1-1 - server [2a03:2880:f215:1d2:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#香港hkg1-2 - server [2a03:2880:f25e:ca:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#香港hkg4-1 - server [2a03:2880:f25e:1ca:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#香港hkg4-2 - #故障，弃用　server [2a03:2880:f20f:c4:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#日本nrt1 - #故障，弃用　server [2a03:2880:f20f:1d0:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#日本nrt2 - server [2a03:2880:f24e:cb:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#日本itm1 - server [2a03:2880:f20c:c4:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡sin6-1 - server [2a03:2880:f20c:2c4:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡sin6-2 - server [2a03:2880:f20c:1ca:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡sin6-3 - server [2a03:2880:f20c:3c2:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡sin6-4 - server [2a03:2880:f25c:cc:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡XSP1-1 - server [2a03:2880:f25c:1cc:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡XSP1-2 - server [2a03:2880:f25c:2c7:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡XSP1-3 - server [2a03:2880:f286:c9:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#新加坡XSP2-1 - #故障，弃用　server [2a03:2880:f24a:ca:face:b00c:0:43fe]:443 max_fails=10 fail_timeout=60s;#韩国GMP - keepalive 16; - keepalive_time 1h; - keepalive_timeout 300s; - keepalive_requests 10000; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name edge-chat.instagram.com; - - access_log logs/Instagram-access.log main buffer=4k; - error_log logs/Instagram-error.log; - - include cert.conf; - location / { - proxy_pass https://list-cdn-ins/; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - include Proxy.params; - } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name gateway.instagram.com; - - access_log logs/Instagram-access.log main buffer=4k; - error_log logs/Instagram-error.log; - - include cert.conf; - location / { - proxy_pass https://[2a03:2880:f05e:115:face:b00c:0:6206]:443/; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - include Proxy.params; - } -} -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name *.cdninstagram.com; - - server_name ig.me; - server_name *.ig.me; - server_name instagr.am; - server_name *.instagr.am; - server_name Instagram.com; - server_name *.Instagram.com; - - access_log logs/Instagram-access.log main buffer=4k; - 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; - - } -} \ 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..5b4735d 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; @@ -44,6 +44,7 @@ http { #include Twitter.conf; #include Twitch.conf; #include Instagram.conf; + #include FaceBook.conf; #include PayPal.conf; #include nhentai.conf; #include GoogleVideo.conf; diff --git a/自签证书傻瓜式批处理包/config_childCA.txt b/自签证书傻瓜式批处理包/config_childCA.txt index 73c3678..6c9af0f 100644 --- a/自签证书傻瓜式批处理包/config_childCA.txt +++ b/自签证书傻瓜式批处理包/config_childCA.txt @@ -34,123 +34,129 @@ DNS.0020 = *.archiveofourown.org DNS.0021 = nyaa.si DNS.0022 = *.nyaa.si DNS.0023 = wikimedia.org -DNS.0024 = upload.wikimedia.org +DNS.0024 = *.wikimedia.org DNS.0025 = exhentai.org -DNS.0026 = e-hentai.org -DNS.0027 = *.e-hentai.org -DNS.0028 = ehgt.org -DNS.0029 = discordapp.com -DNS.0030 = *.discordapp.com -DNS.0031 = discordapp.net -DNS.0032 = *.discordapp.net -DNS.0033 = discord.com -DNS.0034 = *.discord.com -DNS.0035 = discord.gg -DNS.0036 = *.discord.gg -DNS.0037 = ext-twitch.tv -DNS.0038 = *.ext-twitch.tv -DNS.0039 = twitch.tv -DNS.0040 = *.twitch.tv -DNS.0041 = ubi.com -DNS.0042 = *.ubi.com -DNS.0043 = mega.co.nz -DNS.0044 = *.mega.co.nz -DNS.0045 = mega.nz -DNS.0046 = *.mega.nz -DNS.0047 = mega.io -DNS.0048 = *.mega.io -DNS.0049 = steamcommunity.com -DNS.0050 = *.steamcommunity.com -DNS.0051 = steampowered.com -DNS.0052 = *.steampowered.com -DNS.0053 = *.steamstatic.com -DNS.0054 = *.akamai.steamstatic.com -DNS.0055 = akamaihd.net -DNS.0056 = *.akamaihd.net -DNS.0057 = *.akamaized.net -DNS.0058 = *.akamaiedge.net -DNS.0059 = dlsite.com -DNS.0060 = *.dlsite.com -DNS.0061 = *.dlsite.jp -DNS.0062 = *.origin.com -DNS.0063 = *.ea.com -DNS.0064 = githubusercontent.com -DNS.0065 = *.githubusercontent.com -DNS.0066 = github.com -DNS.0067 = *.github.com -DNS.0068 = c15412.* -DNS.0069 = 127.*.*.* -DNS.0070 = patreon.com -DNS.0071 = *.patreon.com -DNS.0072 = patreonusercontent.com -DNS.0073 = *.patreonusercontent.com -DNS.0074 = fanbox.cc -DNS.0075 = downloads.fanbox.cc -DNS.0076 = *.fanbox.cc -DNS.0077 = *.ggpht.com -DNS.0078 = githubassets.com -DNS.0079 = *.githubassets.com -DNS.0080 = 127.0.0.1 -DNS.0081 = doh.sb -DNS.0082 = dns.sb -DNS.0083 = *.dns.sb -DNS.0084 = *.googlevideo.com -DNS.0085 = *.freenom.com -DNS.0086 = *.steam-chat.com -DNS.0087 = steam-chat.com -DNS.0088 = *.twitter.com -DNS.0089 = twitter.com -DNS.0090 = twimg.com -DNS.0091 = *.twimg.com -DNS.0092 = t.co -DNS.0093 = apkpure.com -DNS.0094 = *.apkpure.com -DNS.0095 = nhentai.net -DNS.0096 = *.nhentai.net -DNS.0097 = *.SharePoint.com -DNS.0098 = iwara.tv -DNS.0099 = *.iwara.tv -DNS.0100 = paypal.com -DNS.0101 = *.paypal.com -DNS.0102 = paypalobjects.com -DNS.0103 = *.paypalobjects.com -DNS.0104 = *.cloudflare.steamstatic.com -DNS.0105 = Instagram.com -DNS.0106 = *.Instagram.com -DNS.0107 = *.*.Instagram.com -DNS.0108 = *.*.*.Instagram.com -DNS.0109 = *.ig.me -DNS.0110 = ig.me -DNS.0111 = *.instagr.am -DNS.0112 = instagr.am -DNS.0113 = *.cdninstagram.com -DNS.0114 = guangdongvideo.com -DNS.0115 = *.guangdongvideo.com -DNS.0116 = fc2.com -DNS.0117 = *.live.fc2.com -DNS.0118 = *.fc2.com -DNS.0119 = *.google.ru -DNS.0120 = *.bilivideo.cn -DNS.0121 = *.bilivideo.com -DNS.0122 = *.steamserver.net -DNS.0123 = *.exhentai.org -DNS.0124 = wixmp.com -DNS.0125 = *.wixmp.com -DNS.0126 = ci-en.jp -DNS.0127 = *.ci-en.jp -DNS.0128 = reddit.com -DNS.0129 = *.reddit.com -DNS.0130 = redd.it -DNS.0131 = *.redd.it -DNS.0132 = redditstatic.com -DNS.0133 = *.redditstatic.com -DNS.0134 = redditmedia.com -DNS.0135 = *.redditmedia.com -DNS.0136 = *.thumbs.redditmedia.com -DNS.0137 = wallhaven.cc -DNS.0138 = *.wallhaven.cc -DNS.0139 = x.com -DNS.0140 = *.x.com +DNS.0026 = *.exhentai.org +DNS.0027 = e-hentai.org +DNS.0028 = *.e-hentai.org +DNS.0029 = ehgt.org +DNS.0030 = discordapp.com +DNS.0031 = *.discordapp.com +DNS.0032 = discordapp.net +DNS.0033 = *.discordapp.net +DNS.0034 = discord.com +DNS.0035 = *.discord.com +DNS.0036 = discord.gg +DNS.0037 = *.discord.gg +DNS.0038 = ext-twitch.tv +DNS.0039 = *.ext-twitch.tv +DNS.0040 = twitch.tv +DNS.0041 = *.twitch.tv +DNS.0042 = ubi.com +DNS.0043 = *.ubi.com +DNS.0044 = mega.co.nz +DNS.0045 = *.mega.co.nz +DNS.0046 = mega.nz +DNS.0047 = *.mega.nz +DNS.0048 = mega.io +DNS.0049 = *.mega.io +DNS.0050 = steamcommunity.com +DNS.0051 = *.steamcommunity.com +DNS.0052 = steampowered.com +DNS.0053 = *.steampowered.com +DNS.0054 = *.steamstatic.com +DNS.0055 = *.akamai.steamstatic.com +DNS.0056 = akamaihd.net +DNS.0057 = *.akamaihd.net +DNS.0058 = *.akamaized.net +DNS.0059 = *.akamaiedge.net +DNS.0060 = www.dlsite.com +DNS.0061 = download.dlsite.com +DNS.0062 = *.dlsite.com +DNS.0063 = *.origin.com +DNS.0064 = *.ea.com +DNS.0065 = githubusercontent.com +DNS.0066 = *.githubusercontent.com +DNS.0067 = github.com +DNS.0068 = *.github.com +DNS.0069 = patreon.com +DNS.0070 = *.patreon.com +DNS.0071 = patreonusercontent.com +DNS.0072 = *.patreonusercontent.com +DNS.0073 = fanbox.cc +DNS.0074 = downloads.fanbox.cc +DNS.0075 = *.fanbox.cc +DNS.0076 = *.ggpht.com +DNS.0077 = githubassets.com +DNS.0078 = *.githubassets.com +DNS.0079 = *.googlevideo.com +DNS.0080 = *.freenom.com +DNS.0081 = *.steam-chat.com +DNS.0082 = steam-chat.com +DNS.0083 = *.twitter.com +DNS.0084 = twitter.com +DNS.0085 = twimg.com +DNS.0086 = *.twimg.com +DNS.0087 = t.co +DNS.0088 = apkpure.com +DNS.0089 = *.apkpure.com +DNS.0090 = nhentai.net +DNS.0091 = *.nhentai.net +DNS.0092 = *.SharePoint.com +DNS.0093 = iwara.tv +DNS.0094 = *.iwara.tv +DNS.0095 = paypal.com +DNS.0096 = *.paypal.com +DNS.0097 = paypalobjects.com +DNS.0098 = *.paypalobjects.com +DNS.0099 = *.cloudflare.steamstatic.com +DNS.0100 = Instagram.com +DNS.0101 = *.Instagram.com +DNS.0102 = *.*.Instagram.com +DNS.0103 = *.*.*.Instagram.com +DNS.0104 = *.ig.me +DNS.0105 = ig.me +DNS.0106 = *.instagr.am +DNS.0107 = instagr.am +DNS.0108 = *.cdninstagram.com +DNS.0109 = guangdongvideo.com +DNS.0110 = *.guangdongvideo.com +DNS.0111 = fc2.com +DNS.0112 = *.live.fc2.com +DNS.0113 = *.fc2.com +DNS.0114 = *.google.ru +DNS.0115 = *.bilivideo.cn +DNS.0116 = *.bilivideo.com +DNS.0117 = *.steamserver.net +DNS.0118 = *.exhentai.org +DNS.0119 = wixmp.com +DNS.0120 = *.wixmp.com +DNS.0121 = ci-en.jp +DNS.0122 = *.ci-en.jp +DNS.0123 = reddit.com +DNS.0124 = *.reddit.com +DNS.0125 = redd.it +DNS.0126 = *.redd.it +DNS.0127 = redditstatic.com +DNS.0128 = *.redditstatic.com +DNS.0129 = redditmedia.com +DNS.0130 = *.redditmedia.com +DNS.0131 = *.thumbs.redditmedia.com +DNS.0132 = wallhaven.cc +DNS.0133 = *.wallhaven.cc +DNS.0134 = x.com +DNS.0135 = *.x.com +DNS.0136 = facebook.com +DNS.0137 = *.facebook.com +DNS.0138 = facebook.net +DNS.0139 = *.facebook.net +DNS.0140 = fbsbx.com +DNS.0141 = *.fbsbx.com +DNS.0142 = fbcdn.net +DNS.0143 = *.fbcdn.net +DNS.0144 = *.xx.fbcdn.net + + diff --git a/配置文件（非Windows用户使用）/ca.cer b/配置文件（非Windows用户使用）/ca.cer deleted file mode 100644 index 80d836207ad506390c1b560838213bf1e299e05c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 976 zcmXqLVm@Qg#I$7rGZP~d6DLE%B8de%^b)2T@Un4gwRyCC=VfH%W@RuaGvqelWMd9x zVH0L@_A?YT;0JLyggJsU67$kC5;I{!>_|c)20|cJT*BPGiNzV2MfnOoKF)^P2AUvI zW??0msApbDYEfQliGo{VcB+D7X-P(YQD#Y{g0rK6oH(zcrGcT5xq-2Xk)dUjIIl5? zYXs#En7f)7m5_sok(GhDiIJbdpox)-sfm%1VSdAz>|HWXe5Y*j68N#*g@3Uj!wu)4 zriz-Xw1Pq}p*=cEVJTOWlFen0yipc*Sp4JJ%6+-d8mCt3 zw=Ofa|8nyf*VoLdJ1=E!1+J@lX))t06Whu+nr?e}pQvYvI&kLX2&yjD-!*-em9+7T z?m!0Npb*a3U$$PBCi9cDf90Ku`$u2e?#f0tH4B^gb@%LZG?|zg85kGG8blk&0wY_N zk420{#6HKou)joFBZ~i!=0R=Nx{E4TLJZ_V(#k9n24W4^74U!*2(z#nFf%g#H{b^G z_*qzh$#ofW1OU@0Faj7En4fOxwVHp6|Bv>isb0C;)>fImZQG)8;Mj46&9ioCbk1@P zRo;L1$=)OClV8l$`njg0VS3)q6Y_f3MXrDDxiD=`^HzK3t4SXMgC6dAxBg`6yjT<7 zCx)}NbX>RIJ=FES;j4*^dEdzif4S?{f17xuDdd;LOT#PCkG zxkKgTk*E;0k|{b5ZU$!VU|i6tx6yO)XZ{A3nIajfx|+Mg7W~)iG`YH;@s8GuIs5tc zv@U%wblAOV>L&rIlYi3h+Xktnzu(Lna-wP8Ovjd;`!?q+IkB$z?#0AYOWvLot(V)m grff^y&L77dFPGMAx}m9<$!+Mubz+6zj&J6R00f+8qyPW_ diff --git a/配置文件（非Windows用户使用）/ca/pixiv.net.crt b/配置文件（非Windows用户使用）/ca/pixiv.net.crt deleted file mode 100644 index 8e63155..0000000 --- a/配置文件（非Windows用户使用）/ca/pixiv.net.crt +++ /dev/null @@ -1,93 +0,0 @@ -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 17 (0x11) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C=CN, ST=Shanghai, L=Shanghai, O=Mashiro LLC, CN=Mashiro Internet Fake Authority CA - Validity - Not Before: Oct 16 17:18:43 2020 GMT - Not After : Oct 14 17:18:43 2030 GMT - Subject: C=CN, ST=Shanghai, O=Mashiro LLC, CN=SNI\xE4\xBB\xA3\xE7\x90\x86\xE9\x80\x9A\xE7\x94\xA8\xE8\xAF\x81\xE4\xB9\xA6\xEF\xBC\x88https://2heng.xin/2017/09/19/pixiv/\xEF\xBC\x89 - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) - Modulus: - 00:ce:00:18:cc:64:70:ac:59:b0:45:9e:c3:ee:9e: - 9b:b2:56:59:43:aa:b7:98:6b:bb:86:86:c9:bb:b6: - ed:54:b8:56:de:ec:18:06:62:59:27:3b:d2:16:4a: - 8a:86:ad:40:2b:69:6a:dc:21:12:4b:ca:fd:85:a8: - 01:dd:ec:2a:20:a2:6e:b0:c2:a7:79:88:f9:f4:34: - 95:fb:85:bf:f0:c7:1d:57:29:f8:a5:62:e3:b6:9e: - 52:f7:42:2a:0c:5a:5c:6d:b4:30:51:4e:c1:40:57: - c6:58:57:18:47:9c:59:9d:b7:38:bb:cc:0c:68:aa: - 6c:68:76:be:6f:84:83:12:ef:60:2d:11:61:d8:01: - f0:09:85:8c:80:fa:f0:f6:23:95:c7:97:c1:86:53: - 97:b5:d5:dc:5b:a8:f8:22:49:0a:70:2d:92:77:17: - 41:fd:0e:ba:5b:a7:ce:8f:60:a1:fc:5a:a7:87:19: - 1f:12:f6:c8:b2:32:f4:a8:22:72:ec:97:cc:98:48: - 24:b3:4d:c4:83:7b:9e:1d:15:62:63:37:f5:b6:0c: - 4f:b5:97:33:87:1f:67:cd:0b:bb:71:7b:38:60:c5: - 4f:2f:ad:40:44:0a:8e:af:0c:6c:5a:f4:00:6d:94: - a3:f3:ae:f2:eb:5e:14:68:0a:03:5b:c7:89:09:d0: - f9:bd - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - 4C:B9:F4:49:C1:82:B5:1E:3A:81:63:FA:0C:15:78:A5:F7:4A:AF:FF - X509v3 Authority Key Identifier: - keyid:3F:6C:37:71:8F:74:1B:28:5A:0F:C2:29:C1:2B:05:7E:D1:24:D4:54 - - X509v3 Basic Constraints: - CA:FALSE - X509v3 Key Usage: - Digital Signature, Key Encipherment - X509v3 Subject Alternative Name: - DNS:*.pixiv.net, DNS:pixiv.net, DNS:*.secure.pixiv.net, DNS:pixivision.net, DNS:*.pixivision.net, DNS:pixiv.me, DNS:*.pixiv.me, DNS:pximg.net, DNS:*.pximg.net, DNS:pixivsketch.net, DNS:*.pixivsketch.net, DNS:public-api.secure.pixiv.net, DNS:wikipedia.org, DNS:*.wikipedia.org, DNS:m.wikipedia.org, DNS:*.m.wikipedia.org, DNS:google.com, DNS:*.google.com, DNS:steamcommunity.com, DNS:*.steamcommunity.com, DNS:steampowered.com, DNS:*.steampowered.com, DNS:archiveofourown.org, DNS:*.archiveofourown.org, DNS:wikimedia.org, DNS:*.wikimedia.org - Signature Algorithm: sha256WithRSAEncryption - 74:95:98:78:3d:2d:7b:24:ae:59:9c:9e:84:d1:77:e0:47:92: - 81:28:27:98:e8:4d:b0:83:8d:f9:92:d2:59:2c:e4:be:9f:14: - 4f:3e:e1:1e:49:d3:4a:b7:37:22:4c:45:cd:29:8d:5b:aa:fe: - cb:63:59:21:e0:0b:ea:69:0c:5b:92:09:e6:25:fe:1a:7e:2f: - a6:3c:a4:71:a7:11:5c:5c:8c:aa:31:ff:42:c3:be:3d:d2:df: - 37:9e:47:35:f6:94:d1:af:0a:99:7a:39:07:25:86:7f:ae:bf: - 2d:a8:a6:5f:98:84:54:01:1d:09:32:b0:21:2b:23:d7:81:13: - 99:3d:5c:9b:ba:ce:7b:53:8d:2f:c2:39:a5:93:9b:fa:e2:31: - ce:77:5a:e2:38:a3:f0:95:9a:a7:6b:67:92:93:a4:63:a5:24: - 63:88:21:e9:38:4d:a4:21:d2:a3:67:3c:70:9a:f3:df:f6:45: - 26:b4:18:23:05:04:9f:2f:7e:fd:db:85:b5:e4:c0:71:c6:b4: - 52:d4:dc:cd:91:1f:65:f1:d9:17:8c:d9:03:38:f5:7c:2a:e2: - 3c:e1:43:66:5a:01:cb:5e:56:6b:e4:78:83:17:01:f1:b0:25: - b1:00:c5:37:81:83:94:9d:36:7a:3e:aa:81:23:2b:b1:90:b8: - ea:fe:eb:e2 ------BEGIN CERTIFICATE----- -MIIFljCCBH6gAwIBAgIBETANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJDTjER -MA8GA1UECBMIU2hhbmdoYWkxETAPBgNVBAcTCFNoYW5naGFpMRQwEgYDVQQKEwtN -YXNoaXJvIExMQzErMCkGA1UEAxMiTWFzaGlybyBJbnRlcm5ldCBGYWtlIEF1dGhv -cml0eSBDQTAeFw0yMDEwMTYxNzE4NDNaFw0zMDEwMTQxNzE4NDNaMH8xCzAJBgNV -BAYTAkNOMREwDwYDVQQIEwhTaGFuZ2hhaTEUMBIGA1UEChMLTWFzaGlybyBMTEMx -RzBFBgNVBAMUPlNOSeS7o+eQhumAmueUqOivgeS5pu+8iGh0dHBzOi8vMmhlbmcu -eGluLzIwMTcvMDkvMTkvcGl4aXYv77yJMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwYBmJZ -JzvSFkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4pWLj -tp5S90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh2AHw -CYWMgPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/FqnhxkfEvbI -sjL0qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61ARAqO -rwxsWvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABo4ICJDCCAiAwHQYDVR0OBBYE -FEy59EnBgrUeOoFj+gwVeKX3Sq//MB8GA1UdIwQYMBaAFD9sN3GPdBsoWg/CKcEr -BX7RJNRUMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMIIBxAYDVR0RBIIBuzCCAbeC -CyoucGl4aXYubmV0gglwaXhpdi5uZXSCEiouc2VjdXJlLnBpeGl2Lm5ldIIOcGl4 -aXZpc2lvbi5uZXSCECoucGl4aXZpc2lvbi5uZXSCCHBpeGl2Lm1lggoqLnBpeGl2 -Lm1lgglweGltZy5uZXSCCyoucHhpbWcubmV0gg9waXhpdnNrZXRjaC5uZXSCESou -cGl4aXZza2V0Y2gubmV0ghtwdWJsaWMtYXBpLnNlY3VyZS5waXhpdi5uZXSCDXdp -a2lwZWRpYS5vcmeCDyoud2lraXBlZGlhLm9yZ4IPbS53aWtpcGVkaWEub3JnghEq -Lm0ud2lraXBlZGlhLm9yZ4IKZ29vZ2xlLmNvbYIMKi5nb29nbGUuY29tghJzdGVh -bWNvbW11bml0eS5jb22CFCouc3RlYW1jb21tdW5pdHkuY29tghBzdGVhbXBvd2Vy -ZWQuY29tghIqLnN0ZWFtcG93ZXJlZC5jb22CE2FyY2hpdmVvZm91cm93bi5vcmeC -FSouYXJjaGl2ZW9mb3Vyb3duLm9yZ4INd2lraW1lZGlhLm9yZ4IPKi53aWtpbWVk -aWEub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQB0lZh4PS17JK5ZnJ6E0XfgR5KBKCeY -6E2wg435ktJZLOS+nxRPPuEeSdNKtzciTEXNKY1bqv7LY1kh4AvqaQxbkgnmJf4a -fi+mPKRxpxFcXIyqMf9Cw7490t83nkc19pTRrwqZejkHJYZ/rr8tqKZfmIRUAR0J -MrAhKyPXgROZPVybus57U40vwjmlk5v64jHOd1riOKPwlZqna2eSk6RjpSRjiCHp -OE2kIdKjZzxwmvPf9kUmtBgjBQSfL37924W15MBxxrRS1NzNkR9l8dkXjNkDOPV8 -KuI84UNmWgHLXlZr5HiDFwHxsCWxAMU3gYOUnTZ6PqqBIyuxkLjq/uvi ------END CERTIFICATE----- diff --git a/配置文件（非Windows用户使用）/ca/pixiv.net.key b/配置文件（非Windows用户使用）/ca/pixiv.net.key deleted file mode 100644 index b0079b7..0000000 --- a/配置文件（非Windows用户使用）/ca/pixiv.net.key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEAzgAYzGRwrFmwRZ7D7p6bslZZQ6q3mGu7hobJu7btVLhW3uwY -BmJZJzvSFkqKhq1AK2lq3CESS8r9hagB3ewqIKJusMKneYj59DSV+4W/8McdVyn4 -pWLjtp5S90IqDFpcbbQwUU7BQFfGWFcYR5xZnbc4u8wMaKpsaHa+b4SDEu9gLRFh -2AHwCYWMgPrw9iOVx5fBhlOXtdXcW6j4IkkKcC2SdxdB/Q66W6fOj2Ch/Fqnhxkf -EvbIsjL0qCJy7JfMmEgks03Eg3ueHRViYzf1tgxPtZczhx9nzQu7cXs4YMVPL61A -RAqOrwxsWvQAbZSj867y614UaAoDW8eJCdD5vQIDAQABAoIBAQCgRA0G/2F1hTWR -hIp02+rP3UQHVAsQR0iWycirBQ8xqVTUjCPI27z2vCCffRC25JUW8SXU6tncI6oH -0QTazgCccSLi3B4FfN7R8hN5or4IqjCWfq3Wpc/5ZMWxXkVuZOKh6tzodPf+ggtq -8R+PnwFNpZ065e4FhAlhYHiaNCLxl+sG4MHov+a1saGCuYRIiLnZv3pj165DZod8 -zNIRY7alcpzBbf+um/G4no6naRHJ0Kev9e1HgWjbVfZYtO+kiIowOvNq1XSLJ0KD -ZO16XOAD5YrLW3hgCsdFxfyvwMpnCPJwbg2t6NbEeR/8gOn64zs1bkMLuvecY7rr -c7yhZqVBAoGBAOhTYK3zj7/lc/xoUanR6Fr8QIRXE/YZ4f1EGDX4PT2Hga36gTwI -IOS9Vjx/0kUlZFmvoCV7mMcDwJMTE8BBjYp+N/DvaRkDau67WDwJVFxoEZVvW5ni -I0uoRIBaP4r8FkSI6j56BuKj+7msFS3zL+MgQ8ujvsztJq4uiFmnUogtAoGBAOL9 -+i85EGOOi3vrrdEVy9goFcA5HT9qT+jvtUaqFwHCB4cZEsGx2hNaOVVWm6rBIQtb -Zfg+VqEKaQisjcKAa/8HZ6xApdtSNyWR+OoA7VzRsc+SzhdHkgbsMQifQbEKEe49 -yFVm8xrP/rnVrq87gsrvQcyMH0FB4ljZ4wGWqiHRAoGBAIIYpoviVv3zZGbUl95L -wByrIwm4pWHrjoQ/jHs0Xj7FUdX18EaImrrcV50bSskTrkUWtswmkR/otv7k8Ot5 -CeSi13qg5i5unoO+/yLnaokwcaBHsnjSjEdCm9FwOCMBFQsdzGZd+NsTTtPjTBzm -EEvUdoJjWGXy6vUg85OYwfulAoGBAKYE9kAlr2vxbOlUxctf8riFEOuHmnGwUwPe -lqo5axxZCmJwHzzV1NdErRxSfQZVvNJupdT72yZr08iJVCGHBfYAN35Pxj70EeuD -qReVWAYERNW53MxAB3jStUZGHKjc4aJrQ6Pa6UGaEQdgVyRJFW9RsMFnVtDG3EL6 -EcMuq/6RAoGAWm7c5pdbj1p3bvOrfHpsWrv/qFzozB5LRk2bYwosMASSyLwX6+TF -3QCWL7VOnLQJvQ5ffCWWSs7Ds9kJ/gvIVyelgT6DsyKwi19rjueRix3nFg1faAmI -whLZvr+KVwLYjDYfNmKBwbV8KLZAf5fZ3q9l4lf3rjaQLcfL3LiaUUk= ------END RSA PRIVATE KEY----- diff --git a/配置文件（非Windows用户使用）/hosts b/配置文件（非Windows用户使用）/hosts deleted file mode 100644 index 6f2719b..0000000 --- a/配置文件（非Windows用户使用）/hosts +++ /dev/null @@ -1,130 +0,0 @@ -#UTF-8 encoded -#www.google.com域名仅用于登陆验证 -#如果你不需要这个功能，请把下一行删掉 -127.0.0.1 www.google.com - -#Pixiv Start -127.0.0.1 pixiv.net -127.0.0.1 www.pixiv.net -127.0.0.1 ssl.pixiv.net -127.0.0.1 accounts.pixiv.net -127.0.0.1 touch.pixiv.net -127.0.0.1 oauth.secure.pixiv.net -127.0.0.1 dic.pixiv.net -127.0.0.1 en-dic.pixiv.net -127.0.0.1 sketch.pixiv.net -127.0.0.1 payment.pixiv.net -127.0.0.1 factory.pixiv.net -127.0.0.1 comic.pixiv.net -127.0.0.1 novel.pixiv.net -127.0.0.1 imgaz.pixiv.net -127.0.0.1 sensei.pixiv.net -127.0.0.1 fanbox.pixiv.net -127.0.0.1 source.pixiv.net -127.0.0.1 i1.pixiv.net -127.0.0.1 i2.pixiv.net -127.0.0.1 i3.pixiv.net -127.0.0.1 i4.pixiv.net -127.0.0.1 hls1.pixivsketch.net -127.0.0.1 hls2.pixivsketch.net -127.0.0.1 hls3.pixivsketch.net -127.0.0.1 hls4.pixivsketch.net -127.0.0.1 hls5.pixivsketch.net -127.0.0.1 hls6.pixivsketch.net -127.0.0.1 hls7.pixivsketch.net -127.0.0.1 hls8.pixivsketch.net -127.0.0.1 hls9.pixivsketch.net -127.0.0.1 hls10.pixivsketch.net -127.0.0.1 hls11.pixivsketch.net -127.0.0.1 hls12.pixivsketch.net -127.0.0.1 hls13.pixivsketch.net -127.0.0.1 hls14.pixivsketch.net -127.0.0.1 hls15.pixivsketch.net -127.0.0.1 hls16.pixivsketch.net -127.0.0.1 hls17.pixivsketch.net -127.0.0.1 hls18.pixivsketch.net -127.0.0.1 hls19.pixivsketch.net -127.0.0.1 hls20.pixivsketch.net -127.0.0.1 hlsa1.pixivsketch.net -127.0.0.1 hlsa2.pixivsketch.net -127.0.0.1 hlsa3.pixivsketch.net -127.0.0.1 hlsa4.pixivsketch.net -127.0.0.1 hlsa5.pixivsketch.net -127.0.0.1 hlsa6.pixivsketch.net -127.0.0.1 hlsa7.pixivsketch.net -127.0.0.1 hlsa8.pixivsketch.net -127.0.0.1 hlsa10.pixivsketch.net -127.0.0.1 hlsa11.pixivsketch.net -127.0.0.1 hlsa12.pixivsketch.net -127.0.0.1 hlsa13.pixivsketch.net -127.0.0.1 hlsa14.pixivsketch.net -127.0.0.1 hlsa15.pixivsketch.net -127.0.0.1 hlsa16.pixivsketch.net -127.0.0.1 hlsa17.pixivsketch.net -127.0.0.1 hlsa18.pixivsketch.net -127.0.0.1 hlsa19.pixivsketch.net -127.0.0.1 hlsc1.pixivsketch.net -127.0.0.1 hlsc2.pixivsketch.net -127.0.0.1 hlsc3.pixivsketch.net -127.0.0.1 hlsc4.pixivsketch.net -127.0.0.1 hlsc5.pixivsketch.net -127.0.0.1 hlsc6.pixivsketch.net -127.0.0.1 hlse1.pixivsketch.net -127.0.0.1 hlse2.pixivsketch.net -127.0.0.1 hlse3.pixivsketch.net -127.0.0.1 hlse4.pixivsketch.net -127.0.0.1 hlse5.pixivsketch.net -127.0.0.1 hlse6.pixivsketch.net -127.0.0.1 hlse7.pixivsketch.net -127.0.0.1 hlse8.pixivsketch.net -127.0.0.1 hlse9.pixivsketch.net -127.0.0.1 hlst1.pixivsketch.net -127.0.0.1 i.pximg.net -127.0.0.1 app-api.pixiv.net -13.226.113.16 g-client-proxy.pixiv.net -210.140.131.157 d.pixiv.org -210.140.92.141 pixiv.pximg.net -210.140.92.142 s.pximg.net -210.140.131.246 api.booth.pm -210.140.131.220 myaccount.pixiv.net -#Pixiv End - -# 顺手修一下维基百科 -# Wikipedia Start -127.0.0.1 en.wikipedia.org -127.0.0.1 zh.wikipedia.org #中文维基百科桌面版 -127.0.0.1 en.m.wikipedia.org -127.0.0.1 zh.m.wikipedia.org -127.0.0.1 zh-yue.wikipedia.org #粤文维基百科桌面版 -127.0.0.1 wuu.wikipedia.org #吴语维基百科桌面版 -127.0.0.1 ug.wikipedia.org #维吾尔文维基百科桌面版 -127.0.0.1 ja.wikipedia.org #日文维基百科桌面版 -127.0.0.1 zh.wikinews.org #中文维基新闻桌面版 -# Wikipedia End - -# Wikimedia Start -127.0.0.1 wikimedia.org -127.0.0.1 upload.wikimedia.org -# Wikimedia End - -# 顺手修一下Steam -# Steam Start -127.0.0.1 store.steampowered.com -127.0.0.1 steamcommunity.com -# Steam end - -# AO3 Start -127.0.0.1 archiveofourown.org -# AO3 end - -# Exhentai Start -127.0.0.1 exhentai.org -127.0.0.1 e-hentai.org -127.0.0.1 forums.e-hentai.org -# Exhentai end - -# Nyaa Start -127.0.0.1 nyaa.si -127.0.0.1 www.nyaa.si -127.0.0.1 sukebei.nyaa.si -# Nyaae End diff --git a/配置文件（非Windows用户使用）/nginx.conf b/配置文件（非Windows用户使用）/nginx.conf deleted file mode 100644 index 3b68f93..0000000 --- a/配置文件（非Windows用户使用）/nginx.conf +++ /dev/null @@ -1,253 +0,0 @@ - -#user nobody; -worker_processes 1; - -#error_log logs/error.log; -#error_log logs/error.log notice; -#error_log logs/error.log info; - -#pid logs/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - # '$status $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - server_names_hash_max_size 512; - server_names_hash_bucket_size 1024; - - #gzip on; - - upstream www-pixiv-net { - server 210.140.131.182:443; - server 210.140.131.180:443; - server 210.140.131.184:443; - } - - upstream sketch-pixiv-net { - server 210.140.174.37:443; - server 210.140.170.179:443; - server 210.140.175.130:443; - } - - upstream imgaz-pixiv-net { - server 210.140.131.145:443; - server 210.140.131.144:443; - server 210.140.131.147:443; - server 210.140.131.153:443; - } - - upstream i-pximg-net { - server 210.140.92.140:443; - server 210.140.92.137:443; - server 210.140.92.139:443; - server 210.140.92.142:443; - server 210.140.92.134:443; - server 210.140.92.141:443; - server 210.140.92.143:443; - server 210.140.92.135:443; - server 210.140.92.136:443; - } - - server { - listen 80 default_server; - rewrite ^(.*) https://$host$1 permanent; - } - - server { - listen 443 ssl; - server_name pixiv.net; - server_name www.pixiv.net; - server_name ssl.pixiv.net; - server_name accounts.pixiv.net; - server_name touch.pixiv.net; - server_name oauth.secure.pixiv.net; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - client_max_body_size 50M; - - location / { - proxy_pass https://www-pixiv-net; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_buffering off; - } - } - - server { - listen 443 ssl; - server_name i.pximg.net; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - location / { - proxy_pass https://i-pximg-net; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_buffering off; - } - } - - server { - listen 443 ssl; - server_name sketch.pixiv.net; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - location / { - proxy_pass https://sketch-pixiv-net; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_buffering off; - } - - # Proxying WebSockets - location /ws/ { - proxy_pass https://sketch-pixiv-net; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - } - } - - server { - listen 443 ssl; - server_name factory.pixiv.net; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - location / { - proxy_pass https://210.140.131.180/; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_buffering off; - } - } - - server { - listen 443 ssl; - server_name dic.pixiv.net; - server_name en-dic.pixiv.net; - server_name sensei.pixiv.net; - server_name fanbox.pixiv.net; - server_name payment.pixiv.net.pixiv.net; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - location / { - proxy_pass https://210.140.131.222/; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_buffering off; - } - } - - server { - listen 443 ssl; - server_name imgaz.pixiv.net; - server_name comic.pixiv.net; - server_name novel.pixiv.net; - server_name source.pixiv.net; - server_name i1.pixiv.net; - server_name i2.pixiv.net; - server_name i3.pixiv.net; - server_name i4.pixiv.net; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - location / { - proxy_pass https://imgaz-pixiv-net; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_buffering off; - } - } - - upstream wikipedia-server { - server 198.35.26.96:443; - server 103.102.166.224:443; - } - - server { - listen 443 ssl; - server_name *.wikipedia.org; - server_name *.m.wikipedia.org; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - location / { - proxy_pass https://wikipedia-server/; - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real_IP $remote_addr; - proxy_set_header User-Agent $http_user_agent; - proxy_set_header Accept-Encoding ''; - proxy_buffering off; - } - } - - server { - listen 443 ssl; - server_name www.google.com; - - ssl on; - ssl_certificate ca/pixiv.net.crt; - ssl_certificate_key ca/pixiv.net.key; - - location / { - rewrite ^/(.*)$ https://www.recaptcha.net/$1 redirect; - } - } - -}