From 6ca3889ebbf491973ffafe05e34c5399b6f12998 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 21 Jun 2021 18:25:05 +0100 Subject: [PATCH] Add foundry VTT container --- bootstrap.sh | 1 + docker-compose.yml | 34 ++++++++++++++++++++++++++-------- nginx.conf | 29 +++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 536b832..bb70396 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -92,3 +92,4 @@ docker-compose -f "/opt/scarif/docker-compose.yml" --env-file "/opt/scarif/.env" docker exec -it scarif_pinry_1 python manage.py createsuperuser --settings=pinry.settings.docker # Create user for jitsi docker-compose exec prosody prosodyctl --config /config/prosody.cfg.lua register chris meet.jitsi ${USER_PASSWORD} + diff --git a/docker-compose.yml b/docker-compose.yml index 9b8b2aa..0bae477 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,23 @@ services: networks: - nginx + foundry: + image: felddy/foundryvtt:release + volumes: + - foundry:/data + restart: always + environment: + - "FOUNDRY_PASSWORD=${FOUNDRY_PASSWORD}" + - "FOUNDRY_USERNAME=${FOUNDRY_USER}" + - FOUNDRY_ADMIN_KEY=${FOUNDRY_ADMIN_KEY} + - FOUNDRY_HOSTNAME=https://rec.${DOMAIN} + - FOUNDRY_PROXY_PORT=443 + - FOUNDRY_PORT=443 + - FOUNDRY_PROXY_SSL=true + - FOUNDRY_ROUTE_PREFIX=foundry + networks: + - nginx + monica: build: ./monica image: monica @@ -405,14 +422,14 @@ services: networks: - nginx - #certs: - # <<: *certs - # environment: - # - SSL_SUBJECT=${DOMAIN} - # - CA_SUBJECT=chris@${DOMAIN} - # - SSL_KEY=/certs/${DOMAIN}.key - # - SSL_CSR=/certs/${DOMAIN}.csr - # - SSL_CERT=/certs/${DOMAIN}.crt + # certs: + # <<: *certs + # environment: + # - SSL_SUBJECT=${DOMAIN} + # - CA_SUBJECT=chris@${DOMAIN} + # - SSL_KEY=/certs/${DOMAIN}.key + # - SSL_CSR=/certs/${DOMAIN}.csr + # - SSL_CERT=/certs/${DOMAIN}.crt volumes: db: @@ -422,6 +439,7 @@ volumes: nextcloud: dashboard: pinry: + foundry: networks: db: diff --git a/nginx.conf b/nginx.conf index 3a7c0ef..9a41662 100644 --- a/nginx.conf +++ b/nginx.conf @@ -418,6 +418,35 @@ http { } } + upstream foundry-handler { + server foundry:30000; + } + + server { + listen 443 ssl http2; + + ssl_certificate /etc/nginx/certs/scarif.space.crt; + ssl_certificate_key /etc/nginx/certs/scarif.space.key; + + server_name rec.scarif.space; + + client_max_body_size 300M; + + location /foundry { + + # Set proxy headers + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # These are important to support WebSockets; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + + proxy_pass http://foundry-handler; + } + } + upstream dashboard-handler { server dashboard:5000; }