forked from linux/WebHosting
add tomcat wiki to webhosting to test INC0159147
Signed-off-by: Basil Bruhn <basil.bruhn@psi.ch>
This commit is contained in:
@@ -0,0 +1,21 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name tomcatwiki-test.psi.ch;
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name tomcatwiki-test.psi.ch;
|
||||
|
||||
ssl_certificate /etc/nginx/certs/tomcatwiki-test.psi.ch.crt;
|
||||
ssl_certificate_key /etc/nginx/private/tomcatwiki-test.psi.ch.key;
|
||||
|
||||
location / {
|
||||
proxy_pass http://tomcatwiki:3000;
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -385,10 +385,43 @@ services:
|
||||
networks:
|
||||
- backend
|
||||
|
||||
# Tomcat Beamline Wiki INC0159147 tomcatwiki.psi.ch
|
||||
# goran.lovric@psi.ch
|
||||
tomcatwikidb:
|
||||
image: postgres:15-alpine
|
||||
container_name: tomcatwiki_db
|
||||
restart: always
|
||||
environment:
|
||||
- POSTGRES_DB=wiki
|
||||
- POSTGRES_PASSWORD=${TOMCATWIKI_DB_SECRET}
|
||||
- POSTGRES_USER= wikijs
|
||||
volumes:
|
||||
- /opt/webcontent/tomcatwiki/db-data:/var/lib/postgresql/data
|
||||
networks:
|
||||
- tomcatwiki_backend
|
||||
|
||||
tomcatwiki:
|
||||
image: ghcr.io/requarks/wiki:2
|
||||
container_name: tomcatwiki
|
||||
restart: always
|
||||
depends_on:
|
||||
- tomcatwikidb
|
||||
environment:
|
||||
- DB_TYPE=postgres
|
||||
- DB_HOST=tomcatwikidb
|
||||
- DB_PORT=5432
|
||||
- DB_USER=wikijs
|
||||
- DB_PASS=${TOMCATWIKI_DB_SECRET}
|
||||
- DB_NAME=wiki
|
||||
networks:
|
||||
- tomcatwiki_backend
|
||||
- backend
|
||||
|
||||
networks:
|
||||
public:
|
||||
backend:
|
||||
hedgedoc_backend:
|
||||
it_strategy_dashboard_backend:
|
||||
panda_maintenance_backend:
|
||||
tomcatwiki_backend:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user