From 5e0b89c1762ab6c79d75ca63a00b18ee8f2c8d25 Mon Sep 17 00:00:00 2001 From: flechsig Date: Wed, 26 Aug 2026 15:16:55 +0200 Subject: [PATCH 1/2] new image version 1.8 --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6b6a9ab..2343c1b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -181,7 +181,7 @@ services: # webcontent: # lx-fs-01.psi.ch:/lx_webhosting opticswiki: - image: gitea.psi.ch/images/opticswiki:1.7 + image: gitea.psi.ch/images/opticswiki:1.8 container_name: opticswiki restart: always volumes: From 8e33ab2832233840cbf40ee8c75dc2e9763cc536 Mon Sep 17 00:00:00 2001 From: flechsig Date: Thu, 10 Sep 2026 11:21:30 +0200 Subject: [PATCH 2/2] add slsbl project --- conf.d/slsbl.conf | 28 ++++++++++++++++++++++++++++ docker-compose.yaml | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 conf.d/slsbl.conf diff --git a/conf.d/slsbl.conf b/conf.d/slsbl.conf new file mode 100644 index 0000000..dde5a20 --- /dev/null +++ b/conf.d/slsbl.conf @@ -0,0 +1,28 @@ +# slsbl conf for nginx + +server { + listen 80; + client_max_body_size 20M; + server_name slsbl.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + client_max_body_size 20M; + server_name slsbl.psi.ch; + + ssl_certificate /etc/nginx/certs/slsbl.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/slsbl.psi.ch.key; + + location / { + client_max_body_size 20M; + proxy_pass http://slsbl: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; + proxy_set_header Cookie $http_cookie; + proxy_set_header Authorization $http_authorization; + } +} diff --git a/docker-compose.yaml b/docker-compose.yaml index 2b74adb..006c2ab 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -196,6 +196,22 @@ services: networks: - backend + # Flechsig Uwe + # slsbl + # webcontent: + # lx-fs-01.psi.ch:/lx_webhosting + slsbl: + image: gitea.psi.ch/images/slsbl:1.0 + container_name: slsbl + restart: always + volumes: + - /opt/webcontent/slsbl/cgi-bin:/usr/local/apache2/cgi-bin + - /opt/webcontent/slsbl/conf:/usr/local/apache2/conf + - /opt/webcontent/slsbl/htdocs:/usr/local/apache2/htdocs + - /opt/webcontent/slsbl/log:/var/log/apache2 + networks: + - backend + # Angelo Sozzi INC0150655 angelo.sozzi@psi.ch # POC Software - might be installed on docker-dmz n8n: