diff --git a/common/cinny.conf b/common/cinny.conf index 8fb3aac..dbf6d53 100644 --- a/common/cinny.conf +++ b/common/cinny.conf @@ -1,6 +1,6 @@ add_header Onion-Location http://cinny.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://vernyaourawd4avjf7ye6g43pqovys5wqdr672kervjpev353klq.b32.i2p$request_uri; -root /var/www/cinny; +root /var/www/cinny-git/dist; index index.html; ssi on; location / { diff --git a/common/federationtester.conf b/common/federationtester.conf index 9bb3897..af2bf00 100644 --- a/common/federationtester.conf +++ b/common/federationtester.conf @@ -1,12 +1,12 @@ add_header Onion-Location http://ft.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; add_header X-I2P-Location http://vern54jxta6pdm4zduragtjln4lybvrkuymmdslxlnec3sxur36a.b32.i2p$request_uri; -location /api { - client_max_body_size 100m; - proxy_pass http://localhost:7999/api; + +location / { + proxy_pass https://ft.vern.cc/; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_cookie_path / "/; Secure; HttpOnly; SameSite=lax"; } + root /home/fed-tester/fed-tester-ui/build; diff --git a/common/matrix-sydent.conf b/common/matrix-sydent.conf index cfcb9c7..18e28d0 100644 --- a/common/matrix-sydent.conf +++ b/common/matrix-sydent.conf @@ -2,9 +2,9 @@ add_header Onion-Location http://id.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajh add_header X-I2P-Location http://vern4l4bo3tzed7niopxkfijgbyod6vc7pmqrhice2mjvjfboqua.b32.i2p$request_uri; location / { - proxy_pass http://iceberg.vern.cc/; + proxy_pass https://id.vern.cc/; proxy_redirect off; - proxy_set_header Host $host; + proxy_set_header Host "id.vern.cc"; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; } diff --git a/common/speedtest.conf b/common/speedtest.conf index 6cd862c..ea40091 100644 --- a/common/speedtest.conf +++ b/common/speedtest.conf @@ -4,7 +4,7 @@ add_header X-I2P-Location http://verncfvtpzdyrq4iy72nsv5tq3tmoxblywsxg25v2eydyao location / { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # proxy_set_header Host "ls.vern.cc"; - proxy_pass http://139.144.17.216:8989/; + proxy_pass https://ls.vern.cc/; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/common/website.conf b/common/website.conf index bd7428d..e92f51c 100644 --- a/common/website.conf +++ b/common/website.conf @@ -100,7 +100,7 @@ location @extensionless-php { rewrite ^(.*)$ $1.php last; } -location ~ ^(/media/|/canaries/)$ { +location ~ ^(/media/|/canaries/|/finreport/|/en/finreport/)$ { fancyindex on; fancyindex_exact_size off; fancyindex_default_sort date_desc; diff --git a/conf.d/00website.conf b/conf.d/00website.conf index d2ba07a..291ae79 100644 --- a/conf.d/00website.conf +++ b/conf.d/00website.conf @@ -29,7 +29,8 @@ server { } subs_filter_types text/html text/css text/xml application/javascript text/plain; - subs_filter "wiki.vern.cc" "vernknid6kpyzaghegtnypzxe2nx643zrfc4jivh2tlna5m5jvcq.b32.i2p" + subs_filter "wiki.vern.cc" "vernknid6kpyzaghegtnypzxe2nx643zrfc4jivh2tlna5m5jvcq.b32.i2p"; + subs_filter "gcdn.vern.cc/vernsite" "verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p/media"; include common/website.conf; location ~ ^/socks/(?[\w-]+)/(?[\w-]+)(?/.*)?$ { @@ -75,6 +76,7 @@ server { } subs_filter_types text/html text/css text/xml application/javascript text/plain; subs_filter "wiki.vern.cc" "wiki.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"; + subs_filter "gcdn.vern.cc/vernsite" "vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion/media"; include common/website.conf; } diff --git a/conf.d/bbs.conf b/conf.d/bbs.conf index 780e921..d22f245 100644 --- a/conf.d/bbs.conf +++ b/conf.d/bbs.conf @@ -5,7 +5,7 @@ server { server_name vern5pgpfjdplnz7yhqazesx62hrx6r6i4xvv4kjshwefwikkjjuvwad.onion; subs_filter_types text/html text/css text/xml application/javascript text/plain; - subs_filter "https://ftelnet.vern.cc" "http://ftelnet.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"; + subs_filter "ftelnet.vern.cc" "ftelnet.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion"; include common/bbs.conf; } @@ -17,7 +17,7 @@ server { server_name vernv5abwkzvlzneqto7x6vxw3bwdmd3emdnb4xuvwykwlghwaea.b32.i2p; subs_filter_types text/html text/css text/xml application/javascript text/plain; - subs_filter "https://ftelnet.vern.cc" "http://vernzscupwi6rmlkdivib3q54iqc6fa6bjwe2prxqt3x7mqv4ezq.b32.i2p"; + subs_filter "ftelnet.vern.cc" "vernzscupwi6rmlkdivib3q54iqc6fa6bjwe2prxqt3x7mqv4ezq.b32.i2p"; include common/bbs.conf; } diff --git a/conf.d/federationtester.conf b/conf.d/federationtester.conf index d1c5a18..67a1dbe 100644 --- a/conf.d/federationtester.conf +++ b/conf.d/federationtester.conf @@ -15,17 +15,3 @@ server { include common/federationtester.conf; } - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name ft.vern.cc federationtester.vern.cc; - include snippets/lets-encrypt.conf; - include common/federationtester.conf; -} -server { - listen 80; - listen [::]:80; - server_name ft.vern.cc federationtester.vern.cc; - return 301 https://$host$request_uri; -} diff --git a/conf.d/fulltextrss.conf b/conf.d/fulltextrss.conf index 601ad50..0c0b947 100644 --- a/conf.d/fulltextrss.conf +++ b/conf.d/fulltextrss.conf @@ -8,8 +8,8 @@ server { } server { - listen 11012; - listen [::]:11012; + listen 11083; + listen [::]:11083; server_name vernz3gvdqo6dtfaqmbwqrgzfmhwblfbonvtumo63f3q3h7cr5eq.b32.i2p; diff --git a/conf.d/gcdn.conf b/conf.d/gcdn.conf new file mode 100644 index 0000000..7730cbc --- /dev/null +++ b/conf.d/gcdn.conf @@ -0,0 +1,15 @@ +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name gcdn.vern.cc; + include snippets/lets-encrypt.conf; + root /var/www/gcdn; + fancyindex on; +} + +server { + listen 80; + listen [::]:80; + return 301 https://$host$request_uri; + server_name gcdn.vern.cc; +} diff --git a/conf.d/penpot.conf b/conf.d/penpot.conf index 7e2f2ab..f71336a 100644 --- a/conf.d/penpot.conf +++ b/conf.d/penpot.conf @@ -8,8 +8,8 @@ server { } server { - listen 11067; - listen [::]:11067; + listen 11084; + listen [::]:11084; server_name vernbrpw2ivyireljmadepiwl2zwukfs3qq3neqiygdzd2swyb3a.b32.i2p;