Merge pull request 'Opticswiki' (#11) from flechsig/WebHosting:main into main

Reviewed-on: linux/WebHosting#11
Reviewed-by: bruhn_b <basil.bruhn@psi.ch>
This commit is contained in:
2025-11-04 15:17:48 +01:00
2 changed files with 41 additions and 0 deletions

24
conf.d/opticswiki.conf Normal file
View File

@@ -0,0 +1,24 @@
# opticswiki conf for nginx
# cloned from gfa-status-test.conf
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;
}
}

View File

@@ -130,6 +130,23 @@ services:
networks:
- backend
# Flechsig Uwe <uwe.flechsig@psi.ch>
# 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: docker pull gitea.psi.ch/images/opticswiki:1
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: