From 2280fb03ad6fb50eb2e37e215610d8110719cfa4 Mon Sep 17 00:00:00 2001
From: Basil Bruhn <basil.bruhn@psi.ch>
Date: Tue, 11 Nov 2025 12:42:02 +0100
Subject: [PATCH] make apache config modular

Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
---
 apache/conf/httpd.conf     | 30 ------------------------------
 apache/conf/rfmwtools.conf | 15 +++++++++++++++
 docker-compose.yaml        |  5 ++---
 3 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 apache/conf/httpd.conf
 create mode 100644 apache/conf/rfmwtools.conf

diff --git a/apache/conf/httpd.conf b/apache/conf/httpd.conf
deleted file mode 100644
index 1325bf0..0000000
--- a/apache/conf/httpd.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# Enable modules
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule php_module modules/libphp.so  # already in php:8.2-apache
-
-# Disable default doc root
-<Directory "/var/www/html">
-    Require all denied
-</Directory>
-
-# RFMTools
-DocumentRoot "/var/www/rfmwtools"
-
-<Directory "/var/www/rfmwtools">
-    Options +ExecCGI +FollowSymLinks
-    AddHandler cgi-script .sh .cgi
-    Require all granted
-</Directory>
-
-# Optional: PHP apps under /phpapps (not enabled yet)
-<Directory "/var/www/phpapps">
-    Options Indexes FollowSymLinks
-    AllowOverride All
-    Require all granted
-</Directory>
-
-# Aliases for PHP apps (commented until ready)
-#Alias /phpapp1/ /var/www/phpapps/app1/
-#Alias /phpapp2/ /var/www/phpapps/app2/
-
diff --git a/apache/conf/rfmwtools.conf b/apache/conf/rfmwtools.conf
new file mode 100644
index 0000000..e4d10c0
--- /dev/null
+++ b/apache/conf/rfmwtools.conf
@@ -0,0 +1,15 @@
+<VirtualHost *:80>
+    ServerName rfmwtools-test.psi.ch
+
+    DocumentRoot /var/www/rfmwtools
+
+    <Directory "/var/www/rfmwtools">
+        Options +ExecCGI +FollowSymLinks
+        AddHandler cgi-script .sh .cgi
+        Require all granted
+    </Directory>
+
+    ErrorLog /proc/self/fd/2
+    CustomLog /proc/self/fd/1 combined
+</VirtualHost>
+
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ee7cd7c..b7983b7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -30,9 +30,8 @@ services:
     restart: always
     volumes:
       - /opt/webcontent/rfmwtools:/var/www/rfmwtools:ro
-#      Apache config is prepared to have php apps inside /var/www/phpapps
-#      - ./phpapps:/var/www/phpapps:ro
-      - ./apache/conf/httpd.conf:/usr/local/etc/apache2/httpd.conf:ro
+      - ./apache/conf/rfmwtools.conf:/etc/apache2/sites-enabled/rfmwtools.conf:ro
+
     networks:
       - backend