From c0f379a5e0463b6c7eb5332c2a006f4ae15351a1 Mon Sep 17 00:00:00 2001
From: Basil Bruhn <basil.bruhn@psi.ch>
Date: Fri, 14 Nov 2025 10:27:06 +0100
Subject: [PATCH] deploy rfmwtools and fluid-eos to dmz

Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
---
 apache/conf/rfmwtools.conf | 29 +++++++++++++++++++++++++++++
 conf.d/fluid-eos.conf      | 37 +++++++++++++++++++++++++++++++++++++
 conf.d/rfmwtools.conf      | 21 +++++++++++++++++++++
 docker-compose.yaml        | 14 +++++++++++++-
 4 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 apache/conf/rfmwtools.conf
 create mode 100644 conf.d/fluid-eos.conf
 create mode 100644 conf.d/rfmwtools.conf

diff --git a/apache/conf/rfmwtools.conf b/apache/conf/rfmwtools.conf
new file mode 100644
index 0000000..0e25c02
--- /dev/null
+++ b/apache/conf/rfmwtools.conf
@@ -0,0 +1,29 @@
+<VirtualHost *:80>
+    ServerName rfmwtools.psi.ch
+
+    # Document root for static files
+    DocumentRoot /var/www/rfmwtools
+
+    # CGI scripts
+    ScriptAlias /cgi-bin/ /var/www/rfmwtools/cgi-bin/
+
+    <Directory "/var/www/rfmwtools/cgi-bin">
+        Options +ExecCGI +FollowSymLinks +Indexes
+        AddHandler cgi-script .sh .cgi
+        Require all granted
+
+        SetEnv SCRIPT_WORKDIR /var/www/rfmwtools/cgi-bin
+        DirectoryIndex rfmwtools.html
+    </Directory>
+
+    <Directory "/var/www/rfmwtools">
+        Options Indexes FollowSymLinks
+        AllowOverride None
+        Require all granted
+        DirectoryIndex rfmwtools.html
+    </Directory>
+
+    ErrorLog /proc/self/fd/2
+    CustomLog /proc/self/fd/1 combined
+</VirtualHost>
+
diff --git a/conf.d/fluid-eos.conf b/conf.d/fluid-eos.conf
new file mode 100644
index 0000000..9fa67ab
--- /dev/null
+++ b/conf.d/fluid-eos.conf
@@ -0,0 +1,37 @@
+# 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/fluid-eos;
+    index index.html;
+
+    ssl_certificate     /etc/nginx/certs/fluid-eos-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/fluid-eos-test.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/conf.d/rfmwtools.conf b/conf.d/rfmwtools.conf
new file mode 100644
index 0000000..3d16aa5
--- /dev/null
+++ b/conf.d/rfmwtools.conf
@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name rfmwtools.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name rfmwtools-test.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/rfmwtools-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/rfmwtools-test.psi.ch.key;
+
+    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;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7036f8c..4657809 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,7 +19,19 @@ services:
     networks:
       - public
       - backend
- 
+
+ # rfwtools
+  # gfa-status-test
+  apache:
+    image: gitea.psi.ch/images/php-apache:latest
+    container_name: apache_app
+    restart: always
+    volumes:
+      - /opt/webcontent/DMZ/rfmwtools:/var/www/rfmwtools:ro
+      - ./apache/conf/rfmwtools.conf:/etc/apache2/sites-enabled/rfmwtools.conf:ro
+    networks:
+      - backend
+
 # Huang He <river.huang@psi.ch>
   mcda-calculator:
     image: gitea.psi.ch/images/mcda-calculator:1.0.3