diff --git a/conf/Pixiv.conf b/conf/Pixiv.conf index b2db9d3..2e1cc5a 100644 --- a/conf/Pixiv.conf +++ b/conf/Pixiv.conf @@ -384,6 +384,10 @@ upstream githubusercontent-com { server 185.199.108.133:443; server 185.199.110.133:443; server 185.199.111.133:443; + server 167.82.0.133:443; + server 167.82.20.133:443; + server 167.82.84.133:443; + server 167.82.88.133:443; server 146.75.112.133:443; server 146.75.20.133:443; server 151.101.64.133:443; diff --git a/conf/Steam.conf b/conf/Steam.conf index 1fe9a84..99c7ca5 100644 --- a/conf/Steam.conf +++ b/conf/Steam.conf @@ -1,32 +1,68 @@ upstream steam-store { + ip_hash; #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.195.152.91:443 max_fails=5 fail_timeout=60s;#HighPing + server 96.7.99.225:443 max_fails=5 fail_timeout=60s; + server 104.75.41.21:443 max_fails=5 fail_timeout=60s;#HighPing + server 104.76.74.15:443 max_fails=5 fail_timeout=60s;#HighPing + server 104.69.160.135: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 104.71.154.102:443 max_fails=5 fail_timeout=60s; + server 104.87.193.17:443 max_fails=5 fail_timeout=60s;#HighPing + server 104.116.17.119:443 max_fails=5 fail_timeout=60s;#HighPing + server 118.215.187.181:443 max_fails=5 fail_timeout=60s; + server 184.26.241.15: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.45.56.78:443 max_fails=5 fail_timeout=60s; + server 23.35.228.101: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.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.48.229.101:443 max_fails=5 fail_timeout=60s;# + server 23.40.149.119:443 max_fails=5 fail_timeout=60s; + server 23.41.77.6:443 max_fails=5 fail_timeout=60s; + server 23.41.142.46:443 max_fails=5 fail_timeout=60s; + server 23.46.197.62:443 max_fails=5 fail_timeout=60s; + server 23.48.229.101:443 max_fails=5 fail_timeout=60s; + server 23.51.142.168:443 max_fails=5 fail_timeout=60s; + server 23.56.21.158:443 max_fails=5 fail_timeout=60s; + server 23.77.13.219:443 max_fails=5 fail_timeout=60s; + server 23.77.215.46:443 max_fails=5 fail_timeout=60s; + #server 23.199.225.125:443 max_fails=5 fail_timeout=60s;#HighPing + 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.208.81.63:443 max_fails=5 fail_timeout=60s; + server 23.211.57.127:443 max_fails=5 fail_timeout=60s; + server 23.215.161.136:443 max_fails=5 fail_timeout=60s; + server 23.219.69.47:443 max_fails=5 fail_timeout=60s; + server 23.219.73.99:443 max_fails=5 fail_timeout=60s; + server 184.50.187.66:443 max_fails=5 fail_timeout=60s; keepalive 16; keepalive_time 1h; keepalive_timeout 120; keepalive_requests 10000; } -upstream steam-community { - server 23.1.179.144:443; - server 104.103.145.69:443; +upstream steam-Full { + #server 23.1.179.144:443; + ip_hash; + server 96.7.99.225:443; + server 104.69.45.52:443; + server 104.69.160.135:443; + server 104.71.154.102:443; + server 104.75.41.21:443; + server 104.76.74.15:443; server 104.91.87.202:443; + server 104.103.145.69:443; + server 118.215.187.181:443; + server 173.222.146.99:443; + server 184.26.241.15:443; + server 184.50.187.66:443; + server 184.85.112.102:443; + server 23.36.106.129:443; + server 23.41.77.6:443; + server 23.41.142.46:443; + server 23.51.142.168:443; + server 23.77.13.219:443; } #upstream steam-community302 { @@ -45,7 +81,7 @@ server { include cert.conf; location ^.*(discussions|comment|forum).*$ { - set $rewrite_host "str003.steam302.xyz"; + set $rewrite_host "str001.steam302.xyz"; proxy_pass https://$rewrite_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Real_IP $remote_addr; @@ -53,7 +89,7 @@ server { } location / { - proxy_pass https://steam-community/; + proxy_pass https://steam-Full/; proxy_next_upstream_timeout 60; include Proxy.conf; @@ -65,14 +101,10 @@ server { listen [::]:443 ssl http2; #resolver public1.alidns.com valid=300; server_name store.steampowered.com; - server_name api.steampowered.com; server_name checkout.steampowered.com; - server_name help.steampowered.com; - server_name login.steampowered.com; server_name steampowered.com; include cert.conf; - #access_log logs/SteamCDN-access.log main; access_log off; error_log logs/SteamCDN-error.log; @@ -85,6 +117,25 @@ server { } } +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name api.steampowered.com; + server_name login.steampowered.com; + server_name help.steampowered.com; + + include cert.conf; + access_log off; + error_log logs/SteamCDN-error.log; + + location / { + proxy_pass https://steam-Full/; + proxy_next_upstream error timeout http_403 http_429 http_500 http_502 http_503 http_504 non_idempotent; + proxy_next_upstream_timeout 90; + include Proxy.conf; + } +} + server { listen 443 ssl http2; listen [::]:443 ssl http2; @@ -124,6 +175,7 @@ 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://AkamaiCDN; include Proxy.conf; @@ -135,10 +187,11 @@ server { #SteamStatic 国内cdn：白山云eccdnx：st.dl.eccdnx.com #阿里昆仑雀牛云cdn.queniuqe.com +#Fastly : cdn,media,clan,avatars,video,shared server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name cdn.cloudflare.steamstatic.com cdn.akamai.steamstatic.com cdn.steamstatic.com; + server_name cdn.cloudflare.steamstatic.com cdn.akamai.steamstatic.com cdn.steamstatic.com cdn.fastly.steamstatic.com; include cert.conf; @@ -151,7 +204,7 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name clan.steamstatic.com clan.akamai.steamstatic.com clan.cloudflare.steamstatic.com; + server_name clan.steamstatic.com clan.akamai.steamstatic.com clan.cloudflare.steamstatic.com clan.fastly.steamstatic.com; include cert.conf; @@ -164,7 +217,7 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name avatars.steamstatic.com avatars.akamai.steamstatic.com avatars.cloudflare.steamstatic.com; + server_name avatars.steamstatic.com avatars.akamai.steamstatic.com avatars.cloudflare.steamstatic.com avatars.fastly.steamstatic.com; include cert.conf; @@ -177,7 +230,7 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name store.steamstatic.com store.akamai.steamstatic.com store.cloudflare.steamstatic.com; + server_name store.steamstatic.com store.akamai.steamstatic.com store.cloudflare.steamstatic.com store.fastly.steamstatic.com; include cert.conf; @@ -190,7 +243,7 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name shared.steamstatic.com shared.akamai.steamstatic.com shared.cloudflare.steamstatic.com; + server_name shared.steamstatic.com shared.akamai.steamstatic.com shared.cloudflare.steamstatic.com shared.fastly.steamstatic.com; include cert.conf; @@ -203,7 +256,7 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name video.steamstatic.com video.akamai.steamstatic.com video.cloudflare.steamstatic.com; + server_name video.steamstatic.com video.akamai.steamstatic.com video.cloudflare.steamstatic.com video.fastly.steamstatic.com; include cert.conf; @@ -229,19 +282,52 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; + server_name *.akamai.steamstatic.com; server_name steambroadcast.akamaized.net broadcast.akamai.steamstatic.com broadcast.cloudflare.steamstatic.com; include cert.conf; location / { - 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; } } +upstream steam-fastly { + ip_hash; + server 167.82.3.52:443; + server 167.82.23.52:443; + server 167.82.87.52:443; + server 167.82.91.52:443; + server 146.75.115.52:443; + server 146.75.23.52:443; + server 151.101.67.52:443; + server 151.101.79.52:443; + server 151.101.91.52:443; + server 151.101.111.52:443; + server 151.101.131.52:443; + server 151.101.195.52:443; + server 151.101.231.52:443; + server 199.232.211.52:443; + server 199.232.215.52:443; + server 199.232.235.52:443; +} +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name *.fastly.steamstatic.com; + + include cert.conf; + access_log off; + error_log logs/SteamCDN-error.log; + + location / { + proxy_pass https://steam-fastly/; + proxy_next_upstream error timeout http_403 http_429 http_500 http_502 http_503 http_504 non_idempotent; + proxy_next_upstream_timeout 90; + include Proxy.conf; + } +} # Steam End