diff --git a/common/bbs.conf b/common/bbs.conf index d6e9462..6ea3494 100644 --- a/common/bbs.conf +++ b/common/bbs.conf @@ -1,6 +1,7 @@ add_header Onion-Location http://vern5pgpfjdplnz7yhqazesx62hrx6r6i4xvv4kjshwefwikkjjuvwad.onion$request_uri; add_header X-I2P-Location http://vern6wnypbds4y6zdht5j4ruufbtb4zlcm3baez5w72wjtgiw6ea.b32.i2p$request_uri; -access_log off; +#access_log off; +access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log crit; location / { diff --git a/common/gopherproxy.conf b/common/gopherproxy.conf index 91c9a8d..e4a4835 100644 --- a/common/gopherproxy.conf +++ b/common/gopherproxy.conf @@ -1,7 +1,8 @@ add_header Onion-Location http://gp.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://vernpl3z5syo5sblwnna2v4ktdwjmdotbta4346zekfi64is7idq.b32.i2p$request_uri; -access_log off; +#access_log off; +access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log crit; location / { diff --git a/common/gothub.conf b/common/gothub.conf index 10d1c24..1237611 100644 --- a/common/gothub.conf +++ b/common/gothub.conf @@ -5,9 +5,5 @@ access_log off; error_log /var/log/nginx/error.log crit; location / { - proxy_pass http://10.0.3.57:1520/; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header Host $host; # so Invidious knows domain - proxy_http_version 1.1; # to keep alive - proxy_set_header Connection ""; # to keep alive + return 301 https://vern.cc/blog/odyssey.html; } diff --git a/common/librarian.conf b/common/librarian.conf index 5de0763..805f6ac 100644 --- a/common/librarian.conf +++ b/common/librarian.conf @@ -1,7 +1,8 @@ add_header Onion-Location http://lbry.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://vernb4mvgeej5kawfg3tm337sbihdf4i6oy7w4trirgsnaq67zva.b32.i2p$request_uri; -access_log off; +#access_log off; +access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log crit; location / { diff --git a/common/libretranslate.conf b/common/libretranslate.conf deleted file mode 100644 index 352494d..0000000 --- a/common/libretranslate.conf +++ /dev/null @@ -1,9 +0,0 @@ -add_header Onion-Location http://lt.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; -add_header X-I2P-Location http://vernf45n7mxwqnp5riaax7p67pwcl7wcefdcnqqvim7ckdx4264a.b32.i2p$request_uri; - -location / { - proxy_pass http://127.0.0.1:5001; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-Proto $scheme; -} diff --git a/common/mastodon.conf b/common/mastodon.conf index 5385279..56a820e 100644 --- a/common/mastodon.conf +++ b/common/mastodon.conf @@ -6,6 +6,7 @@ sendfile on; client_max_body_size 80m; root /home/mastodon/live/public; +error_log /var/log/nginx/mastodon.err; gzip on; gzip_disable "msie6"; diff --git a/common/rimgo.conf b/common/rimgo.conf index c6a582f..4aa0519 100644 --- a/common/rimgo.conf +++ b/common/rimgo.conf @@ -1,7 +1,9 @@ +access_log /var/log/nginx/access.log; add_header Onion-Location http://rg.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://vernu3bfx2rvpuaccs5q27yncv6srdijkan6ixbkvyc2lsbrslxq.b32.i2p$request_uri; -access_log off; +#access_log off; +access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log crit; subs_filter rimgo.vern.cc $host; diff --git a/common/simpleamazon.conf b/common/simpleamazon.conf index dc0e11d..3f51b0b 100644 --- a/common/simpleamazon.conf +++ b/common/simpleamazon.conf @@ -1,7 +1,8 @@ add_header Onion-Location http://az.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://vernlncxo4aswplv7naacpjvp5ts4uhrv4wbv3y4skufdbz763gq.b32.i2p$request_uri; -access_log off; +#access_log off; +access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log crit; location / { diff --git a/common/simplelogin.conf b/common/simplelogin.conf index 7c1d11a..baf9c4c 100644 --- a/common/simplelogin.conf +++ b/common/simplelogin.conf @@ -1,6 +1,7 @@ add_header Onion-Location http://sl.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://verndokks33kdmyo23qihg45lb4sinl6f6b34hc7be6754p3b4aa.b32.i2p$request_uri; -access_log off; +#access_log off; +access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log crit; location / { diff --git a/common/website.conf b/common/website.conf index 6aae0d0..1bb0a21 100644 --- a/common/website.conf +++ b/common/website.conf @@ -1,6 +1,7 @@ add_header Onion-Location http://vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p$request_uri; root /var/www/website; +access_log /var/log/nginx/access.log; index index.html index.php; ssi on; gzip on; diff --git a/conf.d/00website.conf b/conf.d/00website.conf index b7dd946..b8ca33c 100644 --- a/conf.d/00website.conf +++ b/conf.d/00website.conf @@ -118,7 +118,8 @@ server { server { listen 80; listen [::]:80; - return 301 https://$host$request_uri; +# return 301 https://$host$request_uri; + return 200 "JgjvzV1cJEz0noDw0I597Euzm2vAu1Ibj_cAmGXKnt0.2r1q1Ilo1S8Gg4uYqfT96sAwG2utxR8e3gCk3tMFGWI"; server_name www.vern.cc vern.cc; } server { diff --git a/conf.d/libretranslate.conf b/conf.d/libretranslate.conf deleted file mode 100644 index c4d9008..0000000 --- a/conf.d/libretranslate.conf +++ /dev/null @@ -1,31 +0,0 @@ -server { - listen 80; - listen [::]:80; - - server_name lt.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion libretranslate.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion; - - include common/libretranslate.conf; -} - -server { - listen 11005; - listen [::]:11005; - - server_name vernf45n7mxwqnp5riaax7p67pwcl7wcefdcnqqvim7ckdx4264a.b32.i2p; - - include common/libretranslate.conf; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - include snippets/lets-encrypt.conf; - server_name lt.vern.cc libretranslate.vern.cc; - include common/libretranslate.conf; -} -server { - listen 80; - listen [::]:80; - return 301 https://$host$request_uri; - server_name lt.vern.cc libretranslate.vern.cc; -} diff --git a/nginx.conf b/nginx.conf index 5b227ae..26dde8c 100644 --- a/nginx.conf +++ b/nginx.conf @@ -20,7 +20,7 @@ http { ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE ssl_prefer_server_ciphers on; # Logging Settings - access_log off; + access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; gzip on; # gzip_vary on;