From f1a21c873a0c614a98776ffe90088fe4e90aa9dc Mon Sep 17 00:00:00 2001 From: jingkaimori <36156959+jingkaimori@users.noreply.github.com> Date: Sat, 17 Oct 2020 01:21:21 +0800 Subject: [PATCH] =?UTF-8?q?=20perf:=20=E5=8F=8D=E4=BB=A3=E7=BB=B4=E5=9F=BA?= =?UTF-8?q?=E5=9B=BE=E5=83=8F=E7=AB=99=EF=BC=8C=E9=83=A8=E5=88=86=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D#26=20=20(#49)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 反代维基图像站，部分修复mashirozx#26 TODO:Mashiro签发新的证书，包含wikimedia.org和upload.wikimedia.org。 * 添加wikimedia证书配置和hosts配置 --- conf/pixiv.conf | 55 ++++++++++++-- hosts | 7 ++ 自签证书傻瓜式批处理包/config_childCA.txt | 2 + 配置文件（非Windows用户使用）/hosts | 90 ++++++++++++++++++++--- 4 files changed, 139 insertions(+), 15 deletions(-) diff --git a/conf/pixiv.conf b/conf/pixiv.conf index 3e7e427..e0aef60 100644 --- a/conf/pixiv.conf +++ b/conf/pixiv.conf @@ -274,10 +274,12 @@ server { } } -upstream wikipedia-server { - server 208.80.153.224:443; - server 208.80.154.224:443; - server 91.198.174.192:443; +upstream wikipedia-text-lb { + #server 198.35.26.96:443; + 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 { @@ -290,7 +292,7 @@ server { ssl_certificate_key ca/pixiv.net.key; location / { - proxy_pass https://wikipedia-server/; + proxy_pass https://wikipedia-text-lb/; 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; @@ -300,6 +302,47 @@ server { } } +server { + listen 443 ssl; + server_name wikimedia.org; + + ssl_certificate ca/pixiv.net.crt; + ssl_certificate_key ca/pixiv.net.key; + + location / { + proxy_pass https://wikipedia-text-lb/; + 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-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 { + listen 443 ssl; + server_name upload.wikimedia.org; + + ssl_certificate ca/pixiv.net.crt; + ssl_certificate_key ca/pixiv.net.key; + + location / { + proxy_pass https://wikipedia-upload-lb/; + 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 *.steamcommunity.com; @@ -358,7 +401,7 @@ server { proxy_buffering off; } } - server { +server { listen 443 ssl; server_name nyaa.si; server_name www.nyaa.si; diff --git a/hosts b/hosts index 8716fed..a6162fd 100644 --- a/hosts +++ b/hosts @@ -89,6 +89,7 @@ 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 #中文维基百科桌面版 @@ -101,6 +102,12 @@ 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 diff --git a/自签证书傻瓜式批处理包/config_childCA.txt b/自签证书傻瓜式批处理包/config_childCA.txt index bc3c5b4..8d9489e 100644 --- a/自签证书傻瓜式批处理包/config_childCA.txt +++ b/自签证书傻瓜式批处理包/config_childCA.txt @@ -37,6 +37,8 @@ DNS.23 = archiveofourown.org DNS.24 = *.archiveofourown.org DNS.25 = nyaa.si DNS.26 = *.nyaa.si +DNS.27 = wikimedia.org +DNS.28 = upload.wikimedia.org [ v3_req ] keyUsage = digitalSignature diff --git a/配置文件（非Windows用户使用）/hosts b/配置文件（非Windows用户使用）/hosts index 3b031e2..447e923 100644 --- a/配置文件（非Windows用户使用）/hosts +++ b/配置文件（非Windows用户使用）/hosts @@ -1,4 +1,5 @@ -#www.google.com域名仅用于登陆验证 +#UTF-8 encoded +#www.google.com域名仅用于登陆验证 #如果你不需要这个功能，请把下一行删掉 127.0.0.1 www.google.com @@ -19,17 +20,73 @@ 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 i.pximg.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 -210.129.120.50 app-api.pixiv.net -74.120.148.207 g-client-proxy.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.159 d.pixiv.org -210.140.92.135 pixiv.pximg.net -210.140.92.134 s.pximg.net +210.140.92.140 pixiv.pximg.net +210.140.92.139 s.pximg.net +210.140.131.246 api.booth.pm +210.140.131.220 myaccount.pixiv.net #Pixiv End # 顺手修一下维基百科 @@ -45,8 +102,23 @@ 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 +# Steam Start 127.0.0.1 store.steampowered.com 127.0.0.1 steamcommunity.com -# Steam end \ No newline at end of file +# Steam end + +# AO3 Start +127.0.0.1 archiveofourown.org +# AO3 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