From 58fbb62facc90d5000821bbb8fc239c56a7ffd20 Mon Sep 17 00:00:00 2001
From: c15412 <70379135+c15412@users.noreply.github.com>
Date: Wed, 4 Sep 2024 19:52:56 +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=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E4=BA=86=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?"not=20signaled=20for=205s"=E5=81=9C=E6=AD=A2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#70)?=
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"停止的问题
---
 conf/Discord.conf     |  19 +++-----
 conf/GoogleVideo.conf |   8 +--
 conf/PayPal.conf      |   2 -
 conf/Pixiv.conf       | 111 +++++++++---------------------------------
 conf/Reddit.conf      |   1 +
 conf/Steam.conf       | 103 ++++++++++++---------------------------
 conf/Twitch.conf      | 105 +++++++++++----------------------------
 conf/Twitter.conf     |   1 -
 conf/instagram.conf   |  12 ++---
 9 files changed, 99 insertions(+), 263 deletions(-)

diff --git a/conf/Discord.conf b/conf/Discord.conf
index e2d8d0c..6d97bdd 100644
--- a/conf/Discord.conf
+++ b/conf/Discord.conf
@@ -28,8 +28,8 @@ server {
     server_name apps.discordapp.com;
     server_name pax.discordapp.com;
 
-    ssl_certificate ca/pixiv.net.crt;
-    ssl_certificate_key ca/pixiv.net.key;
+    include cert.conf;
+
 
     location / {
         proxy_pass https://DiscordApp-com/;
@@ -60,8 +60,7 @@ server {
     server_name bugs.discord.com;
     server_name i18n.discord.com;
 
-    ssl_certificate ca/pixiv.net.crt;
-    ssl_certificate_key ca/pixiv.net.key;
+    include cert.conf;
 
     location / {
         proxy_pass https://Discord-com/;
@@ -96,8 +95,7 @@ server {
     server_name gateway.discord.gg;
     server_name gateway-us-east1-b.discord.gg;
 
-    ssl_certificate ca/pixiv.net.crt;
-    ssl_certificate_key ca/pixiv.net.key;
+    include cert.conf;
 
     location / {
         proxy_pass https://Discord-gg/;
@@ -120,8 +118,7 @@ server {
     server_name safety.discord.com;
     server_name support-dev.discord.com;
 
-    ssl_certificate ca/pixiv.net.crt;
-    ssl_certificate_key ca/pixiv.net.key;
+    include cert.conf;
 
     location / {
         proxy_pass https://support-Discord-com/;
@@ -142,8 +139,7 @@ server {
     listen [::]:443 ssl http2;
     server_name dl.discordapp.net;
 
-    ssl_certificate ca/pixiv.net.crt;
-    ssl_certificate_key ca/pixiv.net.key;
+    include cert.conf;
 
     location / {
         proxy_pass https://dl-discordapp-net/;
@@ -166,8 +162,7 @@ server {
     server_name images-ext-2.discordapp.net;
     server_name images-ext-1.discordapp.net;
 
-    ssl_certificate ca/pixiv.net.crt;
-    ssl_certificate_key ca/pixiv.net.key;
+    include cert.conf;
 
     location / {
         proxy_pass https://media-discordapp-net/;
diff --git a/conf/GoogleVideo.conf b/conf/GoogleVideo.conf
index c8bae2f..7ab9ff7 100644
--- a/conf/GoogleVideo.conf
+++ b/conf/GoogleVideo.conf
@@ -110,7 +110,8 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
     
-    access_log logs/GoogleVideo-access.gzip main gzip=4 buffer=4k;
+    #access_log logs/GoogleVideo-access.gzip main gzip=4 buffer=4k;
+    access_log off;
     error_log logs/GoogleVideo-error.log;
 
     server_name *.googlevideo.com;
@@ -118,7 +119,7 @@ server {
     include cert.conf;
     location / {
         proxy_max_temp_file_size 0;
-        keepalive_timeout 120s;
+        keepalive_timeout 120;
         #resolver [::1]:53 valid=180s ipv4=off ipv6=on;
         proxy_pass https://Google-Video;
         proxy_next_upstream_timeout 60;
@@ -148,8 +149,7 @@ server {
     include cert.conf;
     location / {
         proxy_max_temp_file_size 0;
-        keepalive_timeout 120s;
-        #resolver [::1]:53 valid=180s ipv4=off ipv6=on;
+        keepalive_timeout 120;
         proxy_pass https://ggpht-com;
         proxy_next_upstream_timeout 30;
         include proxy.params;
diff --git a/conf/PayPal.conf b/conf/PayPal.conf
index aedb12a..b77d337 100644
--- a/conf/PayPal.conf
+++ b/conf/PayPal.conf
@@ -8,7 +8,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 223.5.5.5 valid=300s;
         set $checkout_paypal d37t8d3i48djc7.cloudfront.net;
         proxy_pass https://$checkout_paypal:443/;
         include proxy.params;
@@ -23,7 +22,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 223.5.5.5 valid=300s;
         set $c_paypal c-fastly.glb.paypal.com;
         proxy_pass https://$c_paypal:443/;
         include proxy.params;
diff --git a/conf/Pixiv.conf b/conf/Pixiv.conf
index 5b7366d..2bf3cf1 100644
--- a/conf/Pixiv.conf
+++ b/conf/Pixiv.conf
@@ -52,20 +52,10 @@ upstream imgaz-pixiv-net {
     server 210.140.131.144:443;
     server 210.140.131.147:443;
     server 210.140.131.153:443;
-    keepalive 16;	
-    keepalive_timeout 120;
-    keepalive_requests 10000;
 }
 
+
 upstream i-pximg-net {
-    #server s.pximg.net:443;
-    #server 210.140.92.134:443;
-    #server 210.140.92.135:443;
-    #server 210.140.92.136:443;
-    #server 210.140.92.137:443;
-    #server 210.140.92.138:443;
-    #server 210.140.92.139:443;
-    #server 210.140.92.140:443;
     server 210.140.92.141:443;
     server 210.140.92.142:443;
     server 210.140.92.143:443;
@@ -109,31 +99,11 @@ upstream app-api-pixiv-net {
 }
 
 #   default_server Start
-upstream rpc-hh {
-   server 94.100.24.67:80;
-   server 94.100.24.68:80;
-   server 94.100.24.69:80;
-}
 server {
     listen 80 default_server;
     listen [::]:80 default_server;
-    #if ($http_host != "rpc.hentaiathome.net") {
-    #    
     access_log off;
     rewrite ^(.*) https://$host$1 permanent;
-    #}
-    #location / {
-    #    proxy_pass http://rpc-hh/;
-    #    proxy_http_version 1.1;
-    #    proxy_next_upstream_timeout 10;
-    #    proxy_connect_timeout 2;
-    #    proxy_send_timeout 2;
-    #    proxy_read_timeout 2;
-    #    proxy_set_header Host $http_host;
-    #    proxy_set_header User-Agent $http_user_agent;
-    #    proxy_set_header Accept-Encoding '';
-    #    proxy_buffering off;
-    #}
 }
 #   default_server End
 
@@ -149,7 +119,8 @@ server {
 
     location / {
         proxy_pass https://www-pixiv-net;
-        proxy_connect_timeout 5;
+        proxy_connect_timeout 4;
+
         keepalive_timeout 120;
         proxy_set_header Connection "";
         include proxy.params;
@@ -174,7 +145,8 @@ server {
 
     location / {
         proxy_pass https://account-pixiv-net/;
-        proxy_connect_timeout 5;
+        proxy_connect_timeout 4;
+
         keepalive_timeout 120;
         proxy_set_header Connection "";
         include proxy.params;
@@ -210,6 +182,9 @@ server {
 
     location / {
         proxy_pass https://i-pximg-net;
+        keepalive_timeout 120;
+        proxy_set_header Connection "";
+        proxy_next_upstream_timeout 60;
         proxy_connect_timeout 5;
         keepalive_timeout 120;
         proxy_set_header Connection "";
@@ -277,20 +252,6 @@ server {
     }
 }
 
-#server {
-#    listen 443 ssl http2;
-#    listen [::]:443 ssl http2;
-#    server_name factory.pixiv.net;
-#
-#    include cert.conf;
-#
-#    location / {
-#        proxy_pass https://210.140.131.180:443/;
-#        proxy_http_version 1.1;
-#        include proxy.params;
-#    }
-#}
-
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -313,19 +274,6 @@ server {
         include proxy.params;
     }
 }
-#
-#server {
-#    listen 443 ssl http2;
-#    listen [::]:443 ssl http2;
-#
-#    include cert.conf;
-#    server_name app-api.pixiv.net;
-#    location / {
-#        proxy_pass https://app-api-pixiv-net;
-#        proxy_http_version 1.1;
-#        include proxy.params;
-#    }
-#}
 #   Pixiv End
 
 #   Wiki Start
@@ -431,20 +379,6 @@ server {
 
 #   github Start
 upstream Github-com {
-    #server 140.82.112.3:443;
-    #server 140.82.112.4:443;
-    #server 140.82.113.3:443;
-    #server 140.82.113.4:443;
-    #server 140.82.114.3:443;
-    #server 140.82.114.4:443;
-    #server 140.82.116.3:443;
-    #server 140.82.116.4:443;
-    #server 140.82.121.3:443;
-    #server 140.82.121.4:443;
-    #server 52.69.186.44:443;#
-    #server 52.192.72.89:443;#
-    #server 52.78.231.108:443;#52.192.72.89
-    #server 52.69.186.44:443;
     server 20.205.243.166:443;
     server 20.27.177.113:443;
     server 20.200.245.247:443;
@@ -486,9 +420,9 @@ server {
 
     location / {
         proxy_pass https://Github-com/;
+        proxy_connect_timeout 5;
         keepalive_timeout 120;
         proxy_set_header Connection "";
-        proxy_connect_timeout 5;
         proxy_headers_hash_max_size 8192;
         proxy_buffer_size 128k;
         proxy_buffers 4 256k;
@@ -510,11 +444,9 @@ server {
 
     location / {
         proxy_pass https://githubusercontent-com/;
+        proxy_connect_timeout 5;
         keepalive_timeout 120;
         proxy_set_header Connection "";
-        proxy_connect_timeout 4;
-        #proxy_read_timeout 1;
-        #proxy_send_timeout 1;
         proxy_next_upstream_timeout 32;
         proxy_set_header Range $http_range;
         proxy_set_header If-Range $http_if_range;
@@ -524,13 +456,13 @@ server {
 #    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;
-}
+#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;
@@ -540,7 +472,7 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://Origin-CDN/;
+        proxy_pass https://steamstatic-akamai/;
         include proxy.params;
     }
 }
@@ -553,7 +485,8 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://api2.origin.com:443/;
+        set $rewrite_host "api2.origin.com";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
@@ -566,9 +499,9 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://e8688.e12.akamaiedge.net:443/;
+        set $rewrite_host "e8688.e12.akamaiedge.net";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
 #    EA End
-
diff --git a/conf/Reddit.conf b/conf/Reddit.conf
index 9b74676..0ce2d38 100644
--- a/conf/Reddit.conf
+++ b/conf/Reddit.conf
@@ -41,6 +41,7 @@ server {
         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;
diff --git a/conf/Steam.conf b/conf/Steam.conf
index b12368c..fc59e82 100644
--- a/conf/Steam.conf
+++ b/conf/Steam.conf
@@ -1,75 +1,41 @@
 upstream steam-store {
-    server 104.71.48.121:443  max_fails=2 fail_timeout=60s;
-    #server 23.1.179.144:443  max_fails=2 fail_timeout=60s;#HighPing
-    #server 23.45.56.78:443  max_fails=2 fail_timeout=60s;#HighPing
-    server 184.24.82.108:443  max_fails=2 fail_timeout=60s;
-    server 184.85.112.102:443  max_fails=2 fail_timeout=60s;
-    server 184.87.103.42:443  max_fails=2 fail_timeout=60s;
-    server 23.77.215.46:443  max_fails=2 fail_timeout=60s;#
-    server 23.51.142.168:443  max_fails=2 fail_timeout=60s;#
-    server 23.41.77.6:443  max_fails=2 fail_timeout=60s;#
-    #server 23.36.106.129:443  max_fails=2 fail_timeout=60s;#HighPing
-    #server 23.36.252.78:443  max_fails=2 fail_timeout=60s;#HighPing
-    server 23.208.81.63:443  max_fails=2 fail_timeout=60s;#
-    server 23.200.148.81:443  max_fails=2 fail_timeout=60s;#
-    server 23.200.152.81:443  max_fails=2 fail_timeout=60s;#
-    server 23.219.73.99:443  max_fails=2 fail_timeout=60s;#
-    server 23.211.57.127:443  max_fails=2 fail_timeout=60s;#
-    server 23.219.69.47:443  max_fails=2 fail_timeout=60s;#
-    #server 23.195.152.91:443  max_fails=2 fail_timeout=60s;#HighPing
-    server 23.198.37.119:443  max_fails=2 fail_timeout=60s;#
-    server 23.48.229.101:443  max_fails=2 fail_timeout=60s;#
+    server 104.71.48.121:443  max_fails=5 fail_timeout=60s;
+    #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 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.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;
-    keepalive_timeout 300s;
+    keepalive_timeout 120;
     keepalive_requests 10000;
-
-    #server steampowered.com:443;
-    #server www.steampowered.com:443;
-    #server store.steampowered.com:443;
 }
 upstream steam-community {
     server 23.1.179.144:443;
     server 104.103.145.69:443;
     server 104.91.87.202:443;
-    #server 104.78.121.166:443;
-    #server 104.85.204.121:443;
-    #server 104.103.245.88:443;
-    #server 104.124.156.199:443;
-    #server 104.127.87.210:443;
-    #server 184.26.129.66:443;
-    #server 23.45.56.78:443;
-    #server 23.53.54.51:443;
-    #server 23.58.33.236:443;
-    #server 23.212.216.106:443;
 }
 
-upstream steam-chat {
-    #server humblebundle-a.akamaihd.net:443;
-    #server eaassets-a.akamaihd.net:443;
-    server 184.26.252.135:443;
-    #keepalive 16;
-    #keepalive_requests 10000;
-}
-
-#upstream steam-cdn {
-#    server eaassets-a.akamaihd.net:443;
-#    server steamuserimages-a.akamaihd.net:443;
-#    server steamuserimages-a.akamaihd.net.edgesuite.net:443;
-#    #server steamstore-a.akamaihd.net:443;
-#    #server steamcommunity-a.akamaihd.net:443;
-#    server a1737.b.akamai.net:443;
-#    server a1843.g1.akamai.net:443;
-#    server a1507.dscw27.akamai.net:443;
-#    server a1639.dscb.akamai.net:443;
+#upstream steam-community302 {
+#    server str001.steam302.xyz:443;
+#    server str002.steam302.xyz:443;
+#    server str003.steam302.xyz:443;
 #}
 
-upstream steam-community302 {
-    server str001.steam302.xyz:443;
-    server str002.steam302.xyz:443;
-    server str003.steam302.xyz:443;
-}
-
 #   Steam Start
 server {
     listen 443 ssl http2;
@@ -80,7 +46,8 @@ server {
     include cert.conf;
     
     location ^.*(discussions|comment|forum).*$ {
-        proxy_pass https://steam-community302/;
+        set $rewrite_host  "str003.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;
         include proxy.params;
@@ -91,10 +58,8 @@ server {
 
         proxy_next_upstream_timeout 60;
         proxy_connect_timeout 6;
-        proxy_send_timeout 6;
-        proxy_read_timeout 6;
         include proxy.params;
-        #proxy_ssl_name $http_host;
+
     }
 }
 
@@ -149,9 +114,9 @@ upstream steamstatic-akamai {
     server 23.202.35.90:443;
     server 23.202.35.120:443;
     server 23.202.35.250:443;
-    keepalive 32;
+    keepalive 16;
     keepalive_time 1h;
-    keepalive_timeout 300s;
+    keepalive_timeout 120;
     keepalive_requests 10000;
 }
 server {
@@ -193,7 +158,6 @@ 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;
@@ -284,7 +248,7 @@ 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_pass https://steamstatic-akamai;
+
         proxy_http_version 1.1;
         proxy_connect_timeout 5;
         keepalive_timeout 120;
@@ -308,10 +272,7 @@ server {
     include cert.conf;
 
     location / {
-        #set $source_host  "broadcast.akamai.steamstatic.com";
-        set $rewrite_host  "${http_host}.edgesuite.net";
-        resolver public1.alidns.com valid=300 ipv4=on ipv6=off;
-        #proxy_pass https://$rewrite_host;
+        #set $rewrite_host  "${http_host}.edgesuite.net";
         proxy_pass https://steamstatic-akamai;
         proxy_connect_timeout 5;
         keepalive_timeout 120;
diff --git a/conf/Twitch.conf b/conf/Twitch.conf
index 9c96306..4669185 100644
--- a/conf/Twitch.conf
+++ b/conf/Twitch.conf
@@ -5,7 +5,8 @@ upstream twitch-tv {
     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 twitch.map.fastly.net:443;
+
 }
 
 server {
@@ -24,9 +25,9 @@ server {
     include cert.conf;
 
     location / {
-        resolver public1.alidns.com valid=300;
         set $twitch_tv twitch.map.fastly.net;
-        proxy_pass https://$twitch_tv:443/;
+        proxy_pass https://$twitch_tv/;
+
         include proxy.params;
     }
 }
@@ -39,7 +40,8 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://5a895ed07aed1b254ee21cd78958ae0b.steam302.xyz:443/;
+        set $rewrite_host "5a895ed07aed1b254ee21cd78958ae0b.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
@@ -52,7 +54,8 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://065f67277ae87878fffaa60519b3ee5c.steam302.xyz:443/;
+        set $rewrite_host "065f67277ae87878fffaa60519b3ee5c.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
@@ -65,7 +68,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=120;
         set $vod_storyboards dlifex0fg7ru9.cloudfront.net;
         proxy_pass https://$vod_storyboards:443/;
         include proxy.params;
@@ -80,7 +82,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $vod_metro d8t045al7vai0.cloudfront.net;
         proxy_pass https://$vod_metro:443/;
         include proxy.params;
@@ -95,7 +96,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $music_twitch_tv d12b3e89c9703p.cloudfront.net;
         proxy_pass https://$music_twitch_tv:443/;
         include proxy.params;
@@ -110,7 +110,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $player_m7g_twitch dnjmu7cm5xw9w.cloudfront.net;
         proxy_pass https://$player_m7g_twitch:443/;
         include proxy.params;
@@ -125,7 +124,9 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://dbc180c27b3635f9e5b006f3a037b87e.steam302.xyz:443/;
+        set $rewrite_host "dbc180c27b3635f9e5b006f3a037b87e.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
+
         include proxy.params;
     }
 }
@@ -143,7 +144,6 @@ upstream d1x43om3304ey9-cloudfront-net {
     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 d1x43om3304ey9.cloudfront.net:443;
 }
 server {
     listen 443 ssl http2;
@@ -153,8 +153,7 @@ server {
     include cert.conf;
 
     location / {
-        resolver public1.alidns.com valid=300;
-        set $blog_twitch d1x43om3304ey9-cloudfront-net;
+        set $blog_twitch d1x43om3304ey9.cloudfront.net;
         proxy_pass https://$blog_twitch:443/;
         include proxy.params;
     }
@@ -183,7 +182,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $dev_twitch_tv d205b01qzi0xib.cloudfront.net;
         proxy_pass https://$dev_twitch_tv:443/;
         include proxy.params;
@@ -198,7 +196,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 223.5.5.5 valid=60;
         set $spade_twitch_tv science-edge-external-prod-73889260.us-west-2.elb.amazonaws.com;
         proxy_pass https://$spade_twitch_tv/;
         include proxy.params;
@@ -213,7 +210,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $vod_secure_twitch_tv ds0h3roq6wcgc.cloudfront.net;
         proxy_pass https://$vod_secure_twitch_tv/;
         include proxy.params;
@@ -228,7 +224,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $trowel_twitch_tv science-edge-external-prod-73889260.us-west-2.elb.amazonaws.com;
         proxy_pass https://$trowel_twitch_tv/;
         include proxy.params;
@@ -243,7 +238,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $extension_files_twitch d36mepituis1gg.cloudfront.net;
         proxy_pass https://$extension_files_twitch:443/;
         include proxy.params;
@@ -258,7 +252,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 223.5.5.5 valid=60;
         set $help_twitch_tv e26428.dscx.akamaiedge.net;
         proxy_pass https://$help_twitch_tv:443/;
         include proxy.params;
@@ -273,19 +266,12 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $brand_twitch d2g064yykcu7rs.cloudfront.net;
         proxy_pass https://$brand_twitch:443/;
         include proxy.params;
     }
 }
 
-upstream passport-twitch-tv {
-    server 52.38.185.174:443;
-    server 34.208.37.185:443;
-    server 52.36.215.144:443;
-    server c3ad68a16f66bff24e2d82595bd240a1.steam302.xyz:443;
-}
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -294,20 +280,13 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://passport-twitch-tv/;
+        set $rewrite_host "c3ad68a16f66bff24e2d82595bd240a1.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
 
-upstream id-twitch-tv {
-    server 52.27.34.51:443;
-    server 52.27.193.97:443;
-    server 35.164.201.113:443;
-    server 35.82.117.112:443;
-    server 35.164.166.201:443;
-    server 52.32.64.194:443;
-    server 2973c6ca0e111662ed293b57dbae9fbf.steam302.xyz:443;
-}
+
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -316,16 +295,12 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://id-twitch-tv/;
+        set $rewrite_host "2973c6ca0e111662ed293b57dbae9fbf.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
 
-upstream link-twitch-tv {
-    server 67.199.248.12:443;
-    server 67.199.248.13:443;
-    server 985a89155dd090eacda1b82388e334ed.steam302.xyz:443;
-}
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -334,7 +309,9 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://link-twitch-tv/;
+        set $rewrite_host "985a89155dd090eacda1b82388e334ed.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
+
         include proxy.params;
     }
 }
@@ -385,17 +362,6 @@ server {
     }
 }
 
-upstream assets-help-twitch-tv {
-    server 13.225.103.75:443;
-    server 13.225.103.43:443;
-    server 13.225.103.12:443;
-    server 13.225.103.14:443;
-    server 54.192.18.40:443;
-    server 54.192.18.82:443;
-    server 54.192.18.83:443;
-    server 54.192.18.93:443;
-    server 6d859be7aa0440f65c8a940ef5218337.steam302.xyz:443;
-}
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -404,15 +370,12 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://assets-help-twitch-tv/;
+        set $rewrite_host "6d859be7aa0440f65c8a940ef5218337.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
 
-upstream discuss-dev-twitch-tv {
-    server 54.69.226.84:443;
-    server 522c432cc10e237a02fa1d6481d7d247.steam302.xyz:443;
-}
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -421,16 +384,12 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://discuss-dev-twitch-tv/;
+        set $rewrite_host "522c432cc10e237a02fa1d6481d7d247.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
 
-upstream ingest-twitch-tv {
-    server 192.108.239.253:443;
-    server 23.160.0.253:443;
-    server b3d696173d52b66e1caab6145cb5058b.steam302.xyz:443;
-}
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -439,17 +398,13 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://ingest-twitch-tv/;
+        set $rewrite_host "b3d696173d52b66e1caab6145cb5058b.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
 
-upstream usher-ttvnw-net {
-    server 124.108.22.138:443;
-    server usher.steam302.xyz:443;
-    #server 192.108.239.254:443;
-    #server 23.160.0.254:443;
-}
+
 server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
@@ -458,7 +413,8 @@ server {
     include cert.conf;
 
     location / {
-        proxy_pass https://usher-ttvnw-net/;
+        set $rewrite_host "usher.steam302.xyz";
+        proxy_pass https://$rewrite_host/;
         include proxy.params;
     }
 }
@@ -471,7 +427,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 223.5.5.5 valid=60;
         set $cvp_twitch e9221.i.akamaiedge.net;
         proxy_pass https://$cvp_twitch:443/;
         include proxy.params;
@@ -486,7 +441,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 9.9.9.12 valid=60;
         set $clips_media_twitch d2xmjdvx03ij56.cloudfront.net;
         proxy_pass https://$clips_media_twitch:443/;
         include proxy.params;
@@ -501,7 +455,6 @@ server {
     include cert.conf;
 
     location / {
-        resolver 223.5.5.5 valid=60;
         set $safety_twitch e28790.dsca.akamaiedge.net;
         proxy_pass https://$safety_twitch:443/;
         include proxy.params;
diff --git a/conf/Twitter.conf b/conf/Twitter.conf
index 22cb48b..1faeff6 100644
--- a/conf/Twitter.conf
+++ b/conf/Twitter.conf
@@ -107,7 +107,6 @@ server {
 
     include cert.conf;
     location / {
-        resolver public1.alidns.com:53 valid=300;
         set $platform_twitter platform.twitter.map.fastly.net;
         proxy_pass https://$platform_twitter:443/;
         include Twitter.params;
diff --git a/conf/instagram.conf b/conf/instagram.conf
index 6187b61..0499c00 100644
--- a/conf/instagram.conf
+++ b/conf/instagram.conf
@@ -78,18 +78,14 @@ server {
     include cert.conf;
     location / {
         proxy_pass https://list-cdn-ins/;
-        include proxy.params;
-
+        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;
 
-        proxy_next_upstream error timeout http_429 http_500 http_502 http_503 http_504 non_idempotent;
-        proxy_connect_timeout 2;
-        proxy_next_upstream_timeout 60;
-        proxy_send_timeout 5;
-        proxy_read_timeout 5;
-        keepalive_timeout 120;
     }
 }
\ No newline at end of file