From 60865c69c5324424cd464a9fae7dd3c4bc5b7c83 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Sun, 5 Nov 2023 20:16:24 +0000
Subject: [PATCH] Add userdir stuff to apache.

---
 etc/apache/sites.d/_default_.conf | 49 +++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/etc/apache/sites.d/_default_.conf b/etc/apache/sites.d/_default_.conf
index 60e50cd..4855be8 100644
--- a/etc/apache/sites.d/_default_.conf
+++ b/etc/apache/sites.d/_default_.conf
@@ -1,3 +1,48 @@
+<Directory /data/home/*/www/html>
+  Options		Includes MultiViews SymlinksIfOwnerMatch
+  AllowOverride		AuthConfig FileInfo Indexes Limit Options
+
+  Require		all granted
+
+  AllowMethods		GET POST OPTIONS
+
+  DirectoryIndex	index.html
+  <IfModule include_module>
+    DirectoryIndex	index.shtml
+  </IfModule>
+
+  <IfModule ssl_module>
+    <FilesMatch "\.(shtml|php)$">
+      SSLOptions	+StdEnvVars
+    </FilesMatch>
+  </IfModule>
+
+  <IfModule proxy_fcgi_module>
+    DirectoryIndex	index.php
+
+    <FilesMatch "\.php$">
+      <If "-f %{REQUEST_FILENAME}">
+        SetHandler	proxy:fcgi://127.0.0.1:9000/
+      </If>
+    </FilesMatch>
+  </IfModule>
+</Directory>
+
+<Directory /data/home/*/www/cgi-bin>
+  Options		Includes MultiViews SymLinksIfOwnerMatch
+  AllowOverride		None
+
+  Require		all granted
+
+  AllowMethods		GET POST OPTIONS
+
+  DirectoryIndex	disabled
+
+  <IfModule ssl_module>
+    SSLOptions		+StdEnvVars
+  </IfModule>
+</Directory>
+
 <VirtualHost 192.168.67.6:80 [2001:470:1f1d:58::67:6]:80 _default_:80>
   ServerName		afterdark.org.uk
   ServerAlias		www.afterdark.org.uk
@@ -24,7 +69,7 @@
     ProxyPassReverse        /git    http://127.0.0.1:3000
 
     <IfModule userdir_module>
-      UserDir		www/html
+      UserDir		/data/home/*/www/html
       UserDir		Disabled	root
     </IfModule>
   </IfModule>
@@ -57,7 +102,7 @@
     ProxyPassReverse        /git    http://127.0.0.1:3000
 
     <IfModule userdir_module>
-      UserDir		www/html
+      UserDir		/data/home/*/www/html
       UserDir		Disabled	root
     </IfModule>
   </VirtualHost>