perf: 反代维基图像站,部分修复#26 (#49)

* 反代维基图像站,部分修复mashirozx#26  TODO:Mashiro签发新的证书,包含wikimedia.org和upload.wikimedia.org。

* 添加wikimedia证书配置和hosts配置
This commit is contained in:
jingkaimori 2020-10-17 01:21:21 +08:00 committed by GitHub
parent c3d514e93c
commit f1a21c873a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 139 additions and 15 deletions

View File

@ -274,10 +274,12 @@ server {
} }
} }
upstream wikipedia-server { upstream wikipedia-text-lb {
server 208.80.153.224:443; #server 198.35.26.96:443;
server 208.80.154.224:443; server 208.80.153.224:443;
server 91.198.174.192:443; server 208.80.154.224:443;
server 91.198.174.192:443;
server 103.102.166.224:443;
} }
server { server {
@ -290,7 +292,7 @@ server {
ssl_certificate_key ca/pixiv.net.key; ssl_certificate_key ca/pixiv.net.key;
location / { location / {
proxy_pass https://wikipedia-server/; proxy_pass https://wikipedia-text-lb/;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Real_IP $remote_addr; 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 { server {
listen 443 ssl; listen 443 ssl;
server_name *.steamcommunity.com; server_name *.steamcommunity.com;
@ -358,7 +401,7 @@ server {
proxy_buffering off; proxy_buffering off;
} }
} }
server { server {
listen 443 ssl; listen 443 ssl;
server_name nyaa.si; server_name nyaa.si;
server_name www.nyaa.si; server_name www.nyaa.si;

7
hosts
View File

@ -89,6 +89,7 @@
210.140.131.220 myaccount.pixiv.net 210.140.131.220 myaccount.pixiv.net
#Pixiv End #Pixiv End
# 顺手修一下维基百科
# Wikipedia Start # Wikipedia Start
127.0.0.1 en.wikipedia.org 127.0.0.1 en.wikipedia.org
127.0.0.1 zh.wikipedia.org #中文维基百科桌面版 127.0.0.1 zh.wikipedia.org #中文维基百科桌面版
@ -101,6 +102,12 @@
127.0.0.1 zh.wikinews.org #中文维基新闻桌面版 127.0.0.1 zh.wikinews.org #中文维基新闻桌面版
# Wikipedia End # Wikipedia End
# Wikimedia Start
127.0.0.1 wikimedia.org
127.0.0.1 upload.wikimedia.org
# Wikimedia End
# 顺手修一下Steam
# Steam Start # Steam Start
127.0.0.1 store.steampowered.com 127.0.0.1 store.steampowered.com
127.0.0.1 steamcommunity.com 127.0.0.1 steamcommunity.com

View File

@ -37,6 +37,8 @@ DNS.23 = archiveofourown.org
DNS.24 = *.archiveofourown.org DNS.24 = *.archiveofourown.org
DNS.25 = nyaa.si DNS.25 = nyaa.si
DNS.26 = *.nyaa.si DNS.26 = *.nyaa.si
DNS.27 = wikimedia.org
DNS.28 = upload.wikimedia.org
[ v3_req ] [ v3_req ]
keyUsage = digitalSignature keyUsage = digitalSignature

View File

@ -1,4 +1,5 @@
#www.google.com域名仅用于登陆验证 #UTF-8 encoded
#www.google.com域名仅用于登陆验证
#如果你不需要这个功能,请把下一行删掉 #如果你不需要这个功能,请把下一行删掉
127.0.0.1 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 imgaz.pixiv.net
127.0.0.1 sensei.pixiv.net 127.0.0.1 sensei.pixiv.net
127.0.0.1 fanbox.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 source.pixiv.net
127.0.0.1 i1.pixiv.net 127.0.0.1 i1.pixiv.net
127.0.0.1 i2.pixiv.net 127.0.0.1 i2.pixiv.net
127.0.0.1 i3.pixiv.net 127.0.0.1 i3.pixiv.net
127.0.0.1 i4.pixiv.net 127.0.0.1 i4.pixiv.net
210.129.120.50 app-api.pixiv.net 127.0.0.1 hls1.pixivsketch.net
74.120.148.207 g-client-proxy.pixiv.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.131.159 d.pixiv.org
210.140.92.135 pixiv.pximg.net 210.140.92.140 pixiv.pximg.net
210.140.92.134 s.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 #Pixiv End
# 顺手修一下维基百科 # 顺手修一下维基百科
@ -45,8 +102,23 @@
127.0.0.1 zh.wikinews.org #中文维基新闻桌面版 127.0.0.1 zh.wikinews.org #中文维基新闻桌面版
# Wikipedia End # Wikipedia End
# Wikimedia Start
127.0.0.1 wikimedia.org
127.0.0.1 upload.wikimedia.org
# Wikimedia End
# 顺手修一下Steam # 顺手修一下Steam
# Steam # Steam Start
127.0.0.1 store.steampowered.com 127.0.0.1 store.steampowered.com
127.0.0.1 steamcommunity.com 127.0.0.1 steamcommunity.com
# Steam end # 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