From 59d0d59717b8883781a0249bd558e049096f7076 Mon Sep 17 00:00:00 2001 From: ritter_t Date: Thu, 29 Jan 2026 14:05:09 +0100 Subject: [PATCH 1/8] it_strategy (#46) Co-authored-by: tom.ritter Reviewed-on: https://gitea.psi.ch/linux/WebHosting/pulls/46 Reviewed-by: buchel_k Co-authored-by: ritter_t Co-committed-by: ritter_t --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4c2e542..6a21f73 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -196,7 +196,7 @@ services: # It-Strategy monitoring dashboard it-strategy-dashboard-frontend: - image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0.1 + image: gitea.psi.ch/9501/it-strategy-dashboard-frontend:4.0.2 container_name: it-strategy-dashboard-frontend command: ["sh","-c","/usr/local/bin/copyData.sh"] volumes: @@ -206,7 +206,7 @@ services: - it_strategy_dashboard_backend it-strategy-dashboard-backend: - image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.1 + image: gitea.psi.ch/9501/it-strategy-dashboard-backend:4.0.2 container_name: it-strategy-dashboard-backend restart: always environment: From f5a7578daa1619d775eb2e61a691b208514f96a3 Mon Sep 17 00:00:00 2001 From: flechsig Date: Thu, 29 Jan 2026 16:50:22 +0100 Subject: [PATCH 2/8] increase client_max_body_size to 20M --- conf.d/opticswiki.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki.conf index a8ea359..3f0b8c5 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -2,12 +2,14 @@ server { listen 80; + client_max_body_size 20M; server_name opticswiki.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; + client_max_body_size 20M; server_name opticswiki.psi.ch; ssl_certificate /etc/nginx/certs/opticswiki.psi.ch.crt; From 5b073b62de003ffda5fd466ab2c7b3a6fc4571db Mon Sep 17 00:00:00 2001 From: flechsig Date: Mon, 2 Feb 2026 09:28:55 +0100 Subject: [PATCH 3/8] WIP increase client_max_body_size to 20M (#47) uploading attachments I receive frequent errors 413 Request entity too large, nginx client_max_body_size default is 1M - I need more Reviewed-on: https://gitea.psi.ch/linux/WebHosting/pulls/47 Reviewed-by: buchel_k Co-authored-by: flechsig Co-committed-by: flechsig --- conf.d/opticswiki.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki.conf index a8ea359..3f0b8c5 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -2,12 +2,14 @@ server { listen 80; + client_max_body_size 20M; server_name opticswiki.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; + client_max_body_size 20M; server_name opticswiki.psi.ch; ssl_certificate /etc/nginx/certs/opticswiki.psi.ch.crt; From cc3d8a6af44db256d9c434a9bce66e89a798059b Mon Sep 17 00:00:00 2001 From: flechsig Date: Tue, 3 Feb 2026 17:03:37 +0100 Subject: [PATCH 4/8] put client_max_body_size also in location block --- conf.d/opticswiki.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki.conf index 3f0b8c5..ed7c65f 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -16,12 +16,12 @@ server { ssl_certificate_key /etc/nginx/private/opticswiki.psi.ch.key; location / { + client_max_body_size 20M; proxy_pass http://opticswiki: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; - # UF add proxy_set_header Cookie $http_cookie; proxy_set_header Authorization $http_authorization; } From 49e472c099ccddaf6d1f64cc2c4a7f211aea76a7 Mon Sep 17 00:00:00 2001 From: flechsig Date: Wed, 4 Feb 2026 08:07:55 +0100 Subject: [PATCH 5/8] WIP client_max_body_size in location block (#48) the client_max_body_size in server block is obviously not sufficient - I put it also in the location block - please pull and restart the container Reviewed-on: https://gitea.psi.ch/linux/WebHosting/pulls/48 Reviewed-by: buchel_k Co-authored-by: flechsig Co-committed-by: flechsig --- conf.d/opticswiki.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki.conf index 3f0b8c5..ed7c65f 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -16,12 +16,12 @@ server { ssl_certificate_key /etc/nginx/private/opticswiki.psi.ch.key; location / { + client_max_body_size 20M; proxy_pass http://opticswiki: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; - # UF add proxy_set_header Cookie $http_cookie; proxy_set_header Authorization $http_authorization; } From 0964aa852b1040a9c5058ceaaf15aff32fee4f2d Mon Sep 17 00:00:00 2001 From: flechsig Date: Wed, 11 Feb 2026 15:05:24 +0100 Subject: [PATCH 6/8] new container version --- docker-compose.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6a21f73..41326e4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -154,18 +154,18 @@ services: - hedgedoc_backend # Flechsig Uwe - # opticswiki (test setup) + # opticswiki # webcontent: # lx-fs-01.psi.ch:/lx_webhosting opticswiki: - image: gitea.psi.ch/images/opticswiki:1.2 + image: gitea.psi.ch/images/opticswiki:1.3 container_name: opticswiki restart: always volumes: - - /opt/webcontent/opticswiki/data:/usr/local/apache2/Foswiki-2.1.9/data - - /opt/webcontent/opticswiki/pub:/usr/local/apache2/Foswiki-2.1.9/pub - - /opt/webcontent/opticswiki/working:/usr/local/apache2/Foswiki-2.1.9/working - - /opt/webcontent/opticswiki/lib:/usr/local/apache2/Foswiki-2.1.9/lib + - /opt/webcontent/opticswiki/data:/usr/local/apache2/wiki/data + - /opt/webcontent/opticswiki/pub:/usr/local/apache2/wiki/pub + - /opt/webcontent/opticswiki/working:/usr/local/apache2/wiki/working + - /opt/webcontent/opticswiki/lib:/usr/local/apache2/wiki/lib - /opt/webcontent/opticswiki/conf:/usr/local/apache2/conf - /opt/webcontent/opticswiki/logs:/var/log/apache2 networks: From 63b0083e78fcf38eeb59b5668649243dea63c63a Mon Sep 17 00:00:00 2001 From: flechsig Date: Wed, 11 Feb 2026 15:12:09 +0100 Subject: [PATCH 7/8] fix log --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 41326e4..d9b1bc3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -167,7 +167,7 @@ services: - /opt/webcontent/opticswiki/working:/usr/local/apache2/wiki/working - /opt/webcontent/opticswiki/lib:/usr/local/apache2/wiki/lib - /opt/webcontent/opticswiki/conf:/usr/local/apache2/conf - - /opt/webcontent/opticswiki/logs:/var/log/apache2 + - /opt/webcontent/opticswiki/log:/var/log/apache2 networks: - backend From f46a1a4f6d0845d2f72ce43569410eb119fec164 Mon Sep 17 00:00:00 2001 From: Basil Bruhn Date: Fri, 13 Feb 2026 11:10:03 +0100 Subject: [PATCH 8/8] rename niagadm to sinqimaging Signed-off-by: Basil Bruhn --- apache/conf/{niagadm.conf => sinqimaging.conf} | 14 +++++++------- conf.d/{niagadm.conf => sinqimaging.conf} | 12 ++++++------ docker-compose.yaml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) rename apache/conf/{niagadm.conf => sinqimaging.conf} (56%) rename conf.d/{niagadm.conf => sinqimaging.conf} (58%) diff --git a/apache/conf/niagadm.conf b/apache/conf/sinqimaging.conf similarity index 56% rename from apache/conf/niagadm.conf rename to apache/conf/sinqimaging.conf index 0797b18..746929b 100644 --- a/apache/conf/niagadm.conf +++ b/apache/conf/sinqimaging.conf @@ -1,26 +1,26 @@ - ServerName niagadm.psi.ch - DocumentRoot /var/www/niagadm + ServerName sinqimaging.psi.ch + DocumentRoot /var/www/sinqimaging # Allow CGI everywhere if needed Options +ExecCGI AddHandler cgi-script .pl .cgi .x .py - + Options +ExecCGI AllowOverride None Require all granted # Explicit CGI directories - ScriptAlias /cgi-bin/ /var/www/niagadm/cgi-bin/ - + ScriptAlias /cgi-bin/ /var/www/sinqimaging/cgi-bin/ + Options +ExecCGI Require all granted - ScriptAlias /cgibin/ /var/www/niagadm/cgibin/ - + ScriptAlias /cgibin/ /var/www/sinqimaging/cgibin/ + Options +ExecCGI Require all granted diff --git a/conf.d/niagadm.conf b/conf.d/sinqimaging.conf similarity index 58% rename from conf.d/niagadm.conf rename to conf.d/sinqimaging.conf index 505626c..071e4e9 100644 --- a/conf.d/niagadm.conf +++ b/conf.d/sinqimaging.conf @@ -1,19 +1,19 @@ server { listen 80; - server_name niagadm.psi.ch; + server_name sinqimaging.psi.ch; return 301 https://$host$request_uri; } server { listen 443 ssl; - server_name niagadm.psi.ch; + server_name sinqimaging.psi.ch; - ssl_certificate /etc/nginx/certs/niagadm.psi.ch.crt; - ssl_certificate_key /etc/nginx/private/niagadm.psi.ch.key; + ssl_certificate /etc/nginx/certs/sinqimaging.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/sinqimaging.psi.ch.key; - access_log /var/log/nginx/niagadm.access.log; - error_log /var/log/nginx/niagadm.error.log; + access_log /var/log/nginx/sinqimaging.access.log; + error_log /var/log/nginx/sinqimaging.error.log; # Proxy EVERYTHING to the Apache container location / { diff --git a/docker-compose.yaml b/docker-compose.yaml index 6a21f73..2aace24 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -37,7 +37,7 @@ services: - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw - /opt/webcontent/sls2:/var/www/sls2:rw - /opt/webcontent/megwiki:/var/www/megwiki:rw - - /opt/webcontent/niagadm:/var/www/niagadm:rw + - /opt/webcontent/sinqimaging:/var/www/sinqimaging:rw - /opt/webcontent/omny:/var/www/omny:rw - /mount/srem/webhosting:/var/www/srem:rw - ./apache/conf:/etc/apache2/sites-enabled:ro