From cc30a18c4040b1e53cd63b4d675ad726ed85edf5 Mon Sep 17 00:00:00 2001
From: Basil Bruhn <basil.bruhn@psi.ch>
Date: Mon, 24 Nov 2025 11:00:11 +0100
Subject: [PATCH] fluid eos

Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
---
 apache/conf/fluid-eos.conf | 28 ++++++++++++++++++++++++++++
 conf.d/fluid-eos-test.conf | 30 ++++++++++++++++++++++++++++++
 conf.d/fluid-eos.conf      | 37 -------------------------------------
 docker-compose.yaml        |  2 ++
 4 files changed, 60 insertions(+), 37 deletions(-)
 create mode 100644 apache/conf/fluid-eos.conf
 create mode 100644 conf.d/fluid-eos-test.conf
 delete mode 100644 conf.d/fluid-eos.conf

diff --git a/apache/conf/fluid-eos.conf b/apache/conf/fluid-eos.conf
new file mode 100644
index 0000000..839c8c0
--- /dev/null
+++ b/apache/conf/fluid-eos.conf
@@ -0,0 +1,28 @@
+<VirtualHost *:80>
+    ServerName fluid-eos-test.psi.ch
+    DocumentRoot /var/www/fluid-eos
+
+    # Allow CGI everywhere if needed
+    Options +ExecCGI
+    AddHandler cgi-script .pl .cgi .x
+
+    <Directory "/var/www/fluid-eos">
+        Options +ExecCGI
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+    # Explicit CGI directories
+    ScriptAlias /cgi-bin/ /var/www/fluid-eos/cgi-bin/
+    <Directory "/var/www/fluid-eos/cgi-bin">
+        Options +ExecCGI
+        Require all granted
+    </Directory>
+
+    ScriptAlias /cgibin/ /var/www/fluid-eos/cgibin/
+    <Directory "/var/www/fluid-eos/cgibin">
+        Options +ExecCGI
+        Require all granted
+    </Directory>
+</VirtualHost>
+
diff --git a/conf.d/fluid-eos-test.conf b/conf.d/fluid-eos-test.conf
new file mode 100644
index 0000000..36dd2f3
--- /dev/null
+++ b/conf.d/fluid-eos-test.conf
@@ -0,0 +1,30 @@
+server {
+    listen 80;
+    server_name fluid-eos.web.psi.ch;
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name fluid-eos.web.psi.ch;
+
+    ssl_certificate     /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key;
+
+    access_log /var/log/nginx/fluid-eos.access.log;
+    error_log  /var/log/nginx/fluid-eos.error.log;
+
+    # Proxy EVERYTHING to the Apache container
+    location / {
+        proxy_pass http://apache_app:80;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        # Important for CGI apps
+        proxy_buffering off;
+    }
+}
+
diff --git a/conf.d/fluid-eos.conf b/conf.d/fluid-eos.conf
deleted file mode 100644
index 4fa0df7..0000000
--- a/conf.d/fluid-eos.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# Churakov Sergey - ISPD migration
-server {
-    listen 80;
-    server_name fluid-eos.web.psi.ch;
-
-    return 301 https://$host$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name fluid-eos.web.psi.ch;
-
-    root /opt/webcontent/DMZ/fluid-eos;
-    index index.html;
-
-    ssl_certificate     /etc/nginx/certs/lx-docker-dmz-01.psi.ch.crt;
-    ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key;
-
-    access_log /var/log/nginx/fluid-eos-test.access.log;
-    error_log  /var/log/nginx/fluid-eos-test.error.log;
-
-    location / {
-        autoindex on;
-        autoindex_exact_size off;
-        autoindex_localtime on;
-
-        try_files $uri $uri/ =404;
-    }
-    location ^~ /EOS/ {
-	autoindex on;
-        autoindex_exact_size off;
-        autoindex_localtime on;
-
-	try_files $uri $uri/ =404;
-    }
-}
-
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4657809..b241be6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,7 +28,9 @@ services:
     restart: always
     volumes:
       - /opt/webcontent/DMZ/rfmwtools:/var/www/rfmwtools:ro
+      - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw
       - ./apache/conf/rfmwtools.conf:/etc/apache2/sites-enabled/rfmwtools.conf:ro
+      - ./apache/conf/fluid-eos.conf:/etc/apache2/sites-enabled/fluid-eos.conf:ro
     networks:
       - backend