From 35e422bfd667dea80c6e2235597e6a8c6f614917 Mon Sep 17 00:00:00 2001
From: root <root@vern.cc>
Date: Fri, 4 Nov 2022 02:25:37 -0400
Subject: [PATCH] add *-user.vern.cc

---
 common/usersites-socket.conf  |  6 +++---
 conf.d/00website.conf         | 10 +++++-----
 conf.d/0x0.conf               |  2 --
 conf.d/usersites-sockets.conf | 35 +++--------------------------------
 4 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/common/usersites-socket.conf b/common/usersites-socket.conf
index bbb2517..7122d7d 100644
--- a/common/usersites-socket.conf
+++ b/common/usersites-socket.conf
@@ -1,5 +1,5 @@
-add_header Onion-Location http://0$user.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri;
-add_header X-I2P-Location http://verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p/socks/$user$request_uri;
+add_header Onion-Location http://$site-$user.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri;
+add_header X-I2P-Location http://verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p/socks/$user/$site$request_uri;
 
 error_log /var/log/nginx/vern.cc-error.log info;
 
@@ -8,7 +8,7 @@ ssi on;
 location / {
 	proxy_pass http://unix:/var/socks/$user.sock;
 	proxy_http_version 1.1;
-	proxy_set_header Host $host;
+	proxy_set_header Host $site-$user.vern.cc;
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_set_header Upgrade $http_upgrade;
 	proxy_set_header Connection $connection_upgrade;
diff --git a/conf.d/00website.conf b/conf.d/00website.conf
index 274b3c9..229402f 100644
--- a/conf.d/00website.conf
+++ b/conf.d/00website.conf
@@ -23,21 +23,21 @@ server {
 #	subs_filter "wiki.vern.cc" "vernknid6kpyzaghegtnypzxe2nx643zrfc4jivh2tlna5m5jvcq.b32.i2p"
 	include common/website.conf;
 
-	location ~ ^/socks/(?<user>[\w-]+)(?<user_uri>/.*)?$ {
-		add_header Onion-Location http://0$user.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri;
-		add_header X-I2P-Location http://verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p/socks/$user$user_uri;
+	location ~ ^/socks/(?<user>[\w-]+)/(?<site>[\w-]+)(?<user_uri>/.*)?$ {
+		add_header Onion-Location http://$site-$user.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri;
+		add_header X-I2P-Location http://verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p/socks/$site/$user$user_uri;
 
 		error_log /var/log/nginx/vern.cc-error.log info;
 
 		proxy_pass http://unix:/var/socks/$user.sock:/;
 		proxy_http_version 1.1;
-		proxy_set_header Host $host;
+		proxy_set_header Host $site-$user.vern.cc;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection $connection_upgrade;
 
 		subs_filter_types text/html text/css text/xml application/javascript text/plain;
-		subs_filter (((file|virtual|src|href)=|url\()["']?)/([^/]) $1/socks/$user/$4 r;
+		subs_filter (((file|virtual|src|href)=|url\()["']?)/([^/]) $1/socks/$user/$site/$4 r;
 
 		error_page 502 =307 http://verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p;
 	}
diff --git a/conf.d/0x0.conf b/conf.d/0x0.conf
index b021763..4ded9dd 100644
--- a/conf.d/0x0.conf
+++ b/conf.d/0x0.conf
@@ -25,7 +25,6 @@ server {
 	server_name 0.vern.cc;
 	include snippets/lets-encrypt.conf;
 	include snippets/headers.conf;
-
 	include common/0x0.conf;
 }
 
@@ -39,6 +38,5 @@ server {
 	ssl_certificate_key /etc/letsencrypt/live/vern0.me/privkey.pem;
 	ssl_certificate /etc/letsencrypt/live/vern0.me/fullchain.pem;
 	include snippets/headers.conf;
-
 	include common/0x0.conf;
 }
diff --git a/conf.d/usersites-sockets.conf b/conf.d/usersites-sockets.conf
index 9d0ba61..e0c1d9b 100644
--- a/conf.d/usersites-sockets.conf
+++ b/conf.d/usersites-sockets.conf
@@ -1,18 +1,7 @@
-server {
-	listen 80;
-	listen [::]:80;
-
-	server_name ~^0(?<user>[^.]+)\.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad\.onion;
-
-	include common/usersites-socket.conf;
-
-	error_page 502 =307 http://vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion;
-}
-
 server {
 	listen 443 ssl http2;
 	listen [::]:443 ssl http2;
-	server_name ~^0(?<user>[^.]+)\.vern\.cc;
+	server_name ~^(?<site>[^.]+)-(?<user>[^.]+)\.vern\.cc;
 	include snippets/lets-encrypt.conf;
 
 	include common/usersites-socket.conf;
@@ -24,32 +13,14 @@ server {
 	listen 80;
 	listen [::]:80;
 	return 301 https://$host$request_uri;
-	server_name ~^0(?<user>[^.]+)\.vern\.cc;
-}
-
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-	server_name ~^[a-z]-(?<user>[^.]+)\.vern\.cc;
-	include snippets/lets-encrypt.conf;
-
-	include common/usersites-socket.conf;
-
-	error_page 502 =307 https://vern.cc;
-}
-
-server {
-	listen 80;
-	listen [::]:80;
-	return 301 https://$host$request_uri;
-	server_name ~^[a-z]-(?<user>[^.]+)\.vern\.cc;
+	server_name ~^(?<site>[^.]+)-(?<user>[^.]+)\.vern\.cc;
 }
 
 server {
 	listen 80;
 	listen [::]:80;
 
-	server_name ~^[a-z]-(?<user>[^.]+)\.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad\.onion;
+	server_name ~^(?<site>[^.]+)-(?<user>[^.]+)\.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad\.onion;
 
 	include common/usersites-socket.conf;