From f54a8730d5821927a4e93f4a4b7f446a02480529 Mon Sep 17 00:00:00 2001
From: southerntofu <southerntofu@thunix.net>
Date: Fri, 24 Apr 2020 21:39:42 +0000
Subject: [PATCH] Point webserver to different folders for each user
 (multisite)

---
 roles/webserver/files/default-site.conf.j2 | 2 +-
 roles/webserver/files/onion.conf.j2        | 2 +-
 roles/webserver/files/users.conf.j2        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/webserver/files/default-site.conf.j2 b/roles/webserver/files/default-site.conf.j2
index 110833b..0a4bd7a 100644
--- a/roles/webserver/files/default-site.conf.j2
+++ b/roles/webserver/files/default-site.conf.j2
@@ -26,7 +26,7 @@ server {
     index index.html;
 
     location ~ ^/~(.+?)(/.*)?$ {
-        alias /home/$1/public_html/$2;
+        alias /home/$1/public/html/tilde/$2;
         autoindex on;
         #try_files $2 $2/ = 404;
     }
diff --git a/roles/webserver/files/onion.conf.j2 b/roles/webserver/files/onion.conf.j2
index eb58077..64fc03b 100644
--- a/roles/webserver/files/onion.conf.j2
+++ b/roles/webserver/files/onion.conf.j2
@@ -3,7 +3,7 @@ server {
     listen [::]:80;
 
     server_name {{ web_onion.stdout }};
-    root /home/{{ item.name }}/public_html;
+    root /home/{{ item.name }}/public/html/onion;
     index index.html;
 
     location / {
diff --git a/roles/webserver/files/users.conf.j2 b/roles/webserver/files/users.conf.j2
index ff85aee..66694da 100644
--- a/roles/webserver/files/users.conf.j2
+++ b/roles/webserver/files/users.conf.j2
@@ -6,7 +6,7 @@ server {
     ssl_certificate /etc/letsencrypt/live/{{ user.name }}.{{ hostname }}/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/{{ user.name }}.{{ hostname }}/privkey.pem;
     server_name {{ user.name }}.{{ hostname }};
-    root /home/{{ user.name }}/public_html;
+    root /home/{{ user.name }}/public/html/domain;
     index index.html;
 
     location / {