Merge branch 'master' into fix

This commit is contained in:
Mashiro 2020-03-06 21:43:41 -06:00 committed by GitHub
commit 1865142d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 26 deletions

View File

@ -36,9 +36,9 @@ http {
#gzip on; #gzip on;
upstream www-pixiv-net { upstream www-pixiv-net {
server 210.140.131.219:443; server 210.140.131.223:443;
server 210.140.131.222:443; server 210.140.131.225:443;
server 210.140.131.216:443; server 210.140.131.220:443;
} }
upstream sketch-pixiv-net { upstream sketch-pixiv-net {
@ -304,24 +304,4 @@ http {
} }
} }
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 / {
#root html;
#index index.html index.htm;
rewrite ^/(.*)$ https://www.recaptcha.net/$1 redirect;
}
#error_page 500 502 503 504 /50x.html;
#/location = /50x.html {
# root html;
#}
}
} }

11
hosts
View File

@ -72,15 +72,20 @@
127.0.0.1 hlse2.pixivsketch.net 127.0.0.1 hlse2.pixivsketch.net
127.0.0.1 hlse3.pixivsketch.net 127.0.0.1 hlse3.pixivsketch.net
127.0.0.1 hlse4.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 hlst1.pixivsketch.net
127.0.0.1 i.pximg.net 127.0.0.1 i.pximg.net
210.129.120.50 app-api.pixiv.net 210.140.131.220 app-api.pixiv.net
13.224.161.82 g-client-proxy.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.140 pixiv.pximg.net 210.140.92.140 pixiv.pximg.net
210.140.92.139 s.pximg.net 210.140.92.139 s.pximg.net
210.140.131.246 api.booth.pm 210.140.131.246 api.booth.pm
210.140.131.219 myaccount.pixiv.net 210.140.131.220 myaccount.pixiv.net
#Pixiv End #Pixiv End
# 顺手修一下维基百科 # 顺手修一下维基百科