use socket instead of port to expose fossil to apache

3 files changed, 7 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 8451d26..6eed340 100644
--- a/Makefile
+++ b/Makefile
@@ -54,6 +54,8 @@ dependencies = socat fossil ssh openssh-server fakeroot
 
 SSH_USERNAME != if [ "$$SUDO_USER" ]; then echo "$$SUDO_USER"; else id -u; fi
 
+USER_HOME != getent passwd $(SSH_USERNAME) | (IFS=: read _ _ _ _ _ h _ && [ "$$h" ] && printf '%s\n' "$$h")
+
 default: install start follow
 install:
         install -t "$(bindir)" -- $(executables)
@@ -65,6 +67,7 @@ install:
         systemctl daemon-reload
         systemctl reload ssh
         systemctl start --wait fossil-disable-apache@-
+        ln -sf -t /var/lib $(USER_HOME)/.cache/fossil-httpd.S
         install -m644 -t /etc/apache2/sites-available -- src/fossil.conf~template
         systemctl start --wait fossil-enable-apache@-
         make start
diff --git a/src/fossil.conf~template b/src/fossil.conf~template
index 797f5e2..49fa7cd 100644
--- a/src/fossil.conf~template
+++ b/src/fossil.conf~template
@@ -5,6 +5,6 @@
         CustomLog ${APACHE_LOG_DIR}/access.log combined
         DocumentRoot /var/www/html
         ProxyPreserveHost on
-        ProxyPass / http://localhost:8079/
-        ProxyPassReverse / http://localhost:8079/
+        ProxyPass / unix:/var/lib/fossil-httpd.S|http://%H
+        ProxyPassReverse / unix:/var/lib/fossil-httpd.S|http://%H
 </VirtualHost>
diff --git a/src/user/fossil-httpd.socket b/src/user/fossil-httpd.socket
index e705ee5..93e92c4 100644
--- a/src/user/fossil-httpd.socket
+++ b/src/user/fossil-httpd.socket
@@ -1,5 +1,6 @@
 [Socket]
 Accept = yes
-ListenStream = 8079
+ListenStream = %C/fossil-httpd.S
+SocketMode = 0666
 [Install]
 WantedBy = sockets.target