From 40c957781f3ae868152c557bb4524e748a7a8011 Mon Sep 17 00:00:00 2001
From: Ryan Hamilton <rhamilton@tulsacounty.org>
Date: Tue, 12 Aug 2025 08:54:02 -0500
Subject: [PATCH] Update Apache configuration to serve users UI from root

---
 Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b20cc44..e4ada1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -79,8 +79,9 @@ fi
 exec apachectl -DFOREGROUND
 EOF
 
-# Replace default vhost so root serves the users UI
-RUN bash -lc 'cat >/etc/apache2/sites-available/000-default.conf <<EOF
+# Make "/" serve the users UI
+RUN set -e; \
+  cat >/etc/apache2/sites-available/000-default.conf <<'EOF'
 <VirtualHost *:80>
   ServerName localhost
   DocumentRoot /var/www/html/daloradius/users
@@ -89,11 +90,11 @@ RUN bash -lc 'cat >/etc/apache2/sites-available/000-default.conf <<EOF
     Require all granted
   </Directory>
   DirectoryIndex index.php
-  ErrorLog \${APACHE_LOG_DIR}/error.log
-  CustomLog \${APACHE_LOG_DIR}/access.log combined
+  ErrorLog ${APACHE_LOG_DIR}/error.log
+  CustomLog ${APACHE_LOG_DIR}/access.log combined
 </VirtualHost>
-EOF' \
- && apache2ctl -t
+EOF
+