From e0b97741dec824d797182c8429d3ca69ac8a6959 Mon Sep 17 00:00:00 2001
From: Basil Bruhn <basil.bruhn@psi.ch>
Date: Tue, 25 Nov 2025 16:22:49 +0100
Subject: [PATCH] simple docker mount and sls2

Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
---
 apache/conf/sls2.conf | 14 ++++++++++++++
 conf.d/sls2.conf      | 27 +++++++++++++++++++++++++++
 docker-compose.yaml   |  5 +----
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 apache/conf/sls2.conf
 create mode 100644 conf.d/sls2.conf

diff --git a/apache/conf/sls2.conf b/apache/conf/sls2.conf
new file mode 100644
index 0000000..5b5b68b
--- /dev/null
+++ b/apache/conf/sls2.conf
@@ -0,0 +1,14 @@
+<VirtualHost *:80>
+    ServerName sls2.psi.ch
+    DocumentRoot /var/www/sls2
+
+    Options +Includes
+
+    <Directory "/var/www/sls2">
+        Options +Includes
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+</VirtualHost>
+
diff --git a/conf.d/sls2.conf b/conf.d/sls2.conf
new file mode 100644
index 0000000..ef83143
--- /dev/null
+++ b/conf.d/sls2.conf
@@ -0,0 +1,27 @@
+server {
+    listen 80;
+    server_name sls2.psi.ch;
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name sls2.psi.ch;
+
+    ssl_certificate     /etc/nginx/certs/sls2.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/sls2.psi.ch.key;
+
+    access_log /var/log/nginx/sls2.access.log;
+    error_log  /var/log/nginx/sls2.error.log;
+
+    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;
+
+    }
+}
+
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a400aed..a2db3dd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -36,10 +36,7 @@ services:
       - /mount/srem/webhosting:/var/www/srem:rw
       - /opt/webcontent/gfa-status:/var/www/gfa-status:rw
       - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw
-      - ./apache/conf/rfmwtools.conf:/etc/apache2/sites-enabled/rfmwtools.conf:ro
-      - ./apache/conf/srem.conf:/etc/apache2/sites-enabled/srem.conf:ro
-      - ./apache/conf/gfa-status.conf:/etc/apache2/sites-enabled/gfa-status.conf:ro
-      - ./apache/conf/fluid-eos.conf:/etc/apache2/sites-enabled/fluid-eos.conf:ro
+      - ./apache/conf:/etc/apache2/sites-enabled:ro
     networks:
       - backend