diff --git a/conf/nginx.conf b/conf/nginx.conf index 64e77c1..be56c06 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,39 +1,36 @@ #user nobody; -worker_processes 1; +worker_processes 1; #error_log logs/error.log; #error_log logs/error.log notice; #error_log logs/error.log info; #pid logs/nginx.pid; - - events { - worker_connections 1024; + worker_connections 1024; } http { - include mime.types; - default_type application/octet-stream; + include mime.types; + default_type application/octet-stream; #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' # '$status $body_bytes_sent "$http_referer" ' # '"$http_user_agent" "$http_x_forwarded_for"'; #access_log logs/access.log main; - - sendfile on; + sendfile on; #tcp_nopush on; #keepalive_timeout 0; - keepalive_timeout 65; + keepalive_timeout 65; client_max_body_size 100m; server_names_hash_max_size 512; server_names_hash_bucket_size 1024; #gzip on; - + include pixiv.conf; } diff --git a/conf/pixiv.conf b/conf/pixiv.conf index adc32e6..f26d707 100644 --- a/conf/pixiv.conf +++ b/conf/pixiv.conf @@ -1,4 +1,4 @@ -upstream www-pixiv-net { +upstream www-pixiv-net { #server 104.18.12.135:443; #server 104.18.13.135:443; server 210.140.131.223:443; @@ -6,13 +6,13 @@ upstream www-pixiv-net { server 210.140.131.220:443; } -upstream account-pixiv-net { +upstream account-pixiv-net { server 210.140.131.226:443; server 210.140.131.218:443; server 210.140.131.222:443; } -upstream sketch-pixiv-net { +upstream sketch-pixiv-net { server 210.140.174.37:443; server 210.140.170.179:443; server 210.140.175.130:443; @@ -24,14 +24,14 @@ upstream sketch-hls-server { server 210.140.214.213:443; } -upstream imgaz-pixiv-net { +upstream imgaz-pixiv-net { server 210.140.131.145:443; server 210.140.131.144:443; server 210.140.131.147:443; server 210.140.131.153:443; } -upstream i-pximg-net { +upstream i-pximg-net { server 210.140.92.140:443; server 210.140.92.137:443; server 210.140.92.139:443; @@ -39,20 +39,20 @@ upstream i-pximg-net { server 210.140.92.134:443; server 210.140.92.141:443; server 210.140.92.143:443; - server 210.140.92.136:443; + server 210.140.92.136:443; server 210.140.92.138:443; server 210.140.92.144:443; server 210.140.92.145:443; } -upstream app-api-pixiv-net { +upstream app-api-pixiv-net { server 210.140.131.218:443; server 210.140.131.223:443; server 210.140.131.226:443; } server { - listen 80 default_server; + listen 80 default_server; rewrite ^(.*) https://$host$1 permanent; } @@ -60,12 +60,12 @@ server { listen 443 ssl; server_name www.pixiv.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + client_max_body_size 50M; - + location / { #proxy_ssl_server_name on; proxy_pass https://www-pixiv-net; @@ -73,7 +73,7 @@ server { 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -86,19 +86,19 @@ server { server_name touch.pixiv.net; server_name oauth.secure.pixiv.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + client_max_body_size 50M; - + location / { proxy_pass https://account-pixiv-net; 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -107,18 +107,20 @@ server { listen 443 ssl; server_name i.pximg.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { - proxy_pass https://i-pximg-net; - 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; + rewrite ^/(.*)$ https://i.pixiv.cat/$1 redirect; + + # proxy_pass https://i-pximg-net; + # 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; } } @@ -126,7 +128,7 @@ server { listen 443 ssl; server_name sketch.pixiv.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; @@ -136,10 +138,10 @@ server { 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_set_header Accept-Encoding ''; proxy_buffering off; } - + # Proxying WebSockets location /ws/ { proxy_pass https://sketch-pixiv-net; @@ -154,7 +156,7 @@ server { listen 443 ssl; server_name *.pixivsketch.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; @@ -164,7 +166,7 @@ server { 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -173,7 +175,7 @@ server { listen 443 ssl; server_name factory.pixiv.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; @@ -183,7 +185,7 @@ server { 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -196,17 +198,17 @@ server { server_name fanbox.pixiv.net; server_name payment.pixiv.net.pixiv.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://210.140.131.222/; 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -222,17 +224,17 @@ server { server_name i3.pixiv.net; server_name i4.pixiv.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://imgaz-pixiv-net; 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -240,17 +242,17 @@ server { server { listen 443 ssl; server_name app-api.pixiv.net; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://app-api-pixiv-net; 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -259,14 +261,14 @@ server { listen 443 ssl; server_name www.google.com; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location ^~ /recaptcha/ { - rewrite ^(.*)$ https://www.recaptcha.net$1 break; + rewrite ^(.*)$ https://www.recaptcha.net$1 break; } - + location / { default_type text/html; charset utf-8; @@ -274,11 +276,11 @@ server { } } -upstream wikipedia-text-lb { - server 208.80.153.224:443; - #server 208.80.154.224:443; - server 91.198.174.192:443; - #server 103.102.166.224:443; +upstream wikipedia-text-lb { + 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 { @@ -286,17 +288,17 @@ server { server_name *.wikipedia.org; server_name *.m.wikipedia.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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -304,41 +306,41 @@ 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_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; +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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -347,17 +349,17 @@ server { server_name *.steamcommunity.com; server_name steamcommunity.com; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://23.61.176.149/; 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -367,36 +369,36 @@ server { server_name *.steampowered.com; server_name steampowered.com; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://104.112.84.145/; 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_set_header Accept-Encoding ''; proxy_buffering off; } } - server { +server { listen 443 ssl; server_name *.archiveofourown.org; server_name archiveofourown.org; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://104.153.64.122/; 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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -409,66 +411,66 @@ server { ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://185.178.208.182/; 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_set_header Accept-Encoding ''; proxy_buffering off; } } -upstream exhentai-lb { - server 178.175.128.252:443; - server 178.175.128.254:443; - server 178.175.129.252:443; - server 178.175.129.254:443; - server 178.175.132.20:443; - server 178.175.132.22:443; +upstream exhentai-lb { + server 178.175.128.252:443; + server 178.175.128.254:443; + server 178.175.129.252:443; + server 178.175.129.254:443; + server 178.175.132.20:443; + server 178.175.132.22:443; } server { listen 443 ssl; server_name exhentai.org; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://exhentai-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_set_header Accept-Encoding ''; proxy_buffering off; } } -upstream e-hentai-lb { - server 104.20.26.25:443; - server 104.20.27.25:443; +upstream e-hentai-lb { + server 104.20.26.25:443; + server 104.20.27.25:443; } server { listen 443 ssl; server_name e-hentai.org; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://e-hentai-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_set_header Accept-Encoding ''; proxy_buffering off; } } @@ -477,17 +479,17 @@ server { listen 443 ssl; server_name forums.e-hentai.org; - + ssl_certificate ca/pixiv.net.crt; ssl_certificate_key ca/pixiv.net.key; - + location / { proxy_pass https://94.100.18.243:443/; 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_set_header Accept-Encoding ''; proxy_buffering off; } } diff --git a/logs/nginx.pid b/logs/nginx.pid index 3737e32..974b70f 100644 --- a/logs/nginx.pid +++ b/logs/nginx.pid @@ -1 +1 @@ -2948 +5812