From 2f90b5cb5e2322e0c9d1815f63bdcfcdae94ded1 Mon Sep 17 00:00:00 2001 From: flechsig Date: Mon, 6 Oct 2025 15:41:30 +0200 Subject: [PATCH 1/8] add opticswiki.conf --- conf.d/opticswiki.conf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 conf.d/opticswiki.conf diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki.conf new file mode 100644 index 0000000..ea93766 --- /dev/null +++ b/conf.d/opticswiki.conf @@ -0,0 +1,24 @@ +# opticswiki conf for nginx +# cloned from gfa-status-test.conf +# adjustments UF 20251006 +server { + listen 80; + server_name opticswiki.psi.ch; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl; + server_name opticswiki.psi.ch; + + ssl_certificate /etc/nginx/certs/opticswiki.psi.ch.crt; + ssl_certificate_key /etc/nginx/private/opticswiki.psi.ch.key; + + location / { + 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; + } +} From 324e8e2879b88c31c9770c1b7114d4d5fc175f23 Mon Sep 17 00:00:00 2001 From: flechsig Date: Mon, 6 Oct 2025 15:46:45 +0200 Subject: [PATCH 2/8] use port 8090 --- conf.d/opticswiki.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/opticswiki.conf b/conf.d/opticswiki.conf index ea93766..4601aa1 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -1,6 +1,6 @@ # opticswiki conf for nginx # cloned from gfa-status-test.conf -# adjustments UF 20251006 +# adjustments UF 20251006 use port 8090 server { listen 80; server_name opticswiki.psi.ch; @@ -15,7 +15,7 @@ server { ssl_certificate_key /etc/nginx/private/opticswiki.psi.ch.key; location / { - proxy_pass http://opticswiki:80; + proxy_pass http://opticswiki:8090; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From 4fe84492c5ba18dda2f3096b59c838fc0ffeff72 Mon Sep 17 00:00:00 2001 From: flechsig Date: Mon, 6 Oct 2025 15:55:42 +0200 Subject: [PATCH 3/8] clone other entry, partial adjustment --- docker-compose.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index f894c18..b2039ed 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -249,3 +249,16 @@ networks: woodpecker_backend: it_strategy_dashboard_backend: + # Flechsig Uwe + # opticswiki (test setup) + opticswiki: + image: gitea.psi.ch/images/elog:3.1.5 + container_name: opticswiki + restart: always + volumes: + - /opt/logbooks/LMU:/usr/local/elog/logbooks + - /opt/webcontent/LMU/elog.cfg:/usr/local/elog/elogd.cfg + networks: + - backend + + From ef30ebf83421b0b8774dc931491e20c7901037f0 Mon Sep 17 00:00:00 2001 From: flechsig Date: Tue, 7 Oct 2025 10:44:54 +0200 Subject: [PATCH 4/8] moved opticswiki after gfa-status-test since Im not sure about the correct intention after woodpecker --- docker-compose.yaml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index b2039ed..899f367 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -130,6 +130,23 @@ services: networks: - backend + # Flechsig Uwe + # opticswiki (test setup) + # I assume gitea.psi.ch/images is the local image repository filled docker push + # /opt/webcontent/opticswiki must be filled once (before starting the container) + # gitea.psi.ch/optics/opticswiki/ => make initvolumes + opticswiki: + image: gitea.psi.ch/images/opticswiki + 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 + networks: + - backend + # Sven Augustin -Hax0rL0rd # CI/CD Aaddition to Gitea (Jenkins for poor people) woodpecker-server: @@ -249,16 +266,5 @@ networks: woodpecker_backend: it_strategy_dashboard_backend: - # Flechsig Uwe - # opticswiki (test setup) - opticswiki: - image: gitea.psi.ch/images/elog:3.1.5 - container_name: opticswiki - restart: always - volumes: - - /opt/logbooks/LMU:/usr/local/elog/logbooks - - /opt/webcontent/LMU/elog.cfg:/usr/local/elog/elogd.cfg - networks: - - backend From 52cd5e5f6884e12049e7d9cd4feaa6e08cf32535 Mon Sep 17 00:00:00 2001 From: flechsig Date: Tue, 7 Oct 2025 11:03:33 +0200 Subject: [PATCH 5/8] verify file format by comparing with original version --- docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 899f367..597a808 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -266,5 +266,3 @@ networks: woodpecker_backend: it_strategy_dashboard_backend: - - From 44c64087ffdde73942e34a3fbd62fc34aaccc5de Mon Sep 17 00:00:00 2001 From: flechsig Date: Thu, 23 Oct 2025 14:06:17 +0200 Subject: [PATCH 6/8] correct port number to 80 --- 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 4601aa1..cf2d303 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -15,7 +15,7 @@ server { ssl_certificate_key /etc/nginx/private/opticswiki.psi.ch.key; location / { - proxy_pass http://opticswiki:8090; + 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; From 7d3007c361acc78ef1c27672f6623e9c4da632fe Mon Sep 17 00:00:00 2001 From: flechsig Date: Thu, 23 Oct 2025 14:06:58 +0200 Subject: [PATCH 7/8] correct comment --- 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 cf2d303..0090bac 100644 --- a/conf.d/opticswiki.conf +++ b/conf.d/opticswiki.conf @@ -1,6 +1,6 @@ # opticswiki conf for nginx # cloned from gfa-status-test.conf -# adjustments UF 20251006 use port 8090 + server { listen 80; server_name opticswiki.psi.ch; From 7fca83e6244c66af252c0b2f09d852c1b08aab5e Mon Sep 17 00:00:00 2001 From: bruhn_b Date: Tue, 4 Nov 2025 15:13:23 +0100 Subject: [PATCH 8/8] Update docker-compose.yaml --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 31fce05..d700f49 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -136,7 +136,7 @@ services: # /opt/webcontent/opticswiki must be filled once (before starting the container) # gitea.psi.ch/optics/opticswiki/ => make initvolumes opticswiki: - image: gitea.psi.ch/images/opticswiki + image: docker pull gitea.psi.ch/images/opticswiki:1 container_name: opticswiki restart: always volumes: