Initial changes for kraut.world

This commit is contained in:
Ludwig Behm 2021-01-02 23:41:35 +01:00
parent 284846e8a5
commit 1c6ec27bca
3 changed files with 35 additions and 17 deletions

3
.gitignore vendored
View File

@ -2,8 +2,9 @@
.idea .idea
.vagrant .vagrant
Vagrantfile Vagrantfile
letsencrypt
docker-compose.override.yaml docker-compose.override.yaml
*.DS_Store *.DS_Store
maps/yarn.lock maps/yarn.lock
maps/dist/computer.js maps/dist/computer.js
maps/dist/computer.js.map maps/dist/computer.js.map

View File

@ -3,10 +3,14 @@ services:
reverse-proxy: reverse-proxy:
image: traefik:v2.0 image: traefik:v2.0
command: command:
- --log.level=DEBUG
- --api.insecure=true - --api.insecure=true
- --providers.docker - --providers.docker
- --entryPoints.web.address=:80 - --entryPoints.web.address=:80
- --entryPoints.websecure.address=:443 - --entryPoints.websecure.address=:443
- --certificatesResolvers.le.acme.httpChallenge.entryPoint=web
- --certificatesResolvers.le.acme.storage=/letsencrypt/acme.json
# - "--certificatesresolvers.le.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@ -17,6 +21,7 @@ services:
- front - front
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- ./letsencrypt:/letsencrypt
front: front:
image: thecodingmachine/nodejs:14 image: thecodingmachine/nodejs:14
@ -26,9 +31,9 @@ services:
JITSI_PRIVATE_MODE: "$JITSI_PRIVATE_MODE" JITSI_PRIVATE_MODE: "$JITSI_PRIVATE_MODE"
HOST: "0.0.0.0" HOST: "0.0.0.0"
NODE_ENV: development NODE_ENV: development
API_URL: pusher.workadventure.localhost API_URL: pusher.kraut.world
UPLOADER_URL: uploader.workadventure.localhost UPLOADER_URL: uploader.kraut.world
ADMIN_URL: admin.workadventure.localhost ADMIN_URL: admin.kraut.world
STARTUP_COMMAND_1: yarn install STARTUP_COMMAND_1: yarn install
TURN_SERVER: "turn:coturn.workadventu.re:443,turns:coturn.workadventu.re:443" TURN_SERVER: "turn:coturn.workadventu.re:443,turns:coturn.workadventu.re:443"
TURN_USER: workadventure TURN_USER: workadventure
@ -37,13 +42,15 @@ services:
volumes: volumes:
- ./front:/usr/src/app - ./front:/usr/src/app
labels: labels:
- "traefik.http.routers.front.rule=Host(`play.workadventure.localhost`)" - "traefik.http.routers.front.rule=Host(`play.kraut.world`)"
- "traefik.http.routers.front.entryPoints=web,traefik" - "traefik.http.routers.front.entryPoints=web,traefik"
- "traefik.http.services.front.loadbalancer.server.port=8080" - "traefik.http.services.front.loadbalancer.server.port=8080"
- "traefik.http.routers.front-ssl.rule=Host(`play.workadventure.localhost`)" - "traefik.http.routers.front-ssl.rule=Host(`play.kraut.world`)"
- "traefik.http.routers.front-ssl.entryPoints=websecure" - "traefik.http.routers.front-ssl.entryPoints=websecure"
- "traefik.http.routers.front-ssl.tls=true" - "traefik.http.routers.front-ssl.tls=true"
- "traefik.http.routers.front-ssl.service=front" - "traefik.http.routers.front-ssl.service=front"
- "traefik.http.routers.front-ssl.tls.certresolver=le"
- "traefik.http.routers.front-ssl.tls.domains[0].main=play.kraut.world"
pusher: pusher:
image: thecodingmachine/nodejs:12 image: thecodingmachine/nodejs:12
@ -62,13 +69,15 @@ services:
volumes: volumes:
- ./pusher:/usr/src/app - ./pusher:/usr/src/app
labels: labels:
- "traefik.http.routers.pusher.rule=Host(`pusher.workadventure.localhost`)" - "traefik.http.routers.pusher.rule=Host(`pusher.kraut.world`)"
- "traefik.http.routers.pusher.entryPoints=web" - "traefik.http.routers.pusher.entryPoints=web"
- "traefik.http.services.pusher.loadbalancer.server.port=8080" - "traefik.http.services.pusher.loadbalancer.server.port=8080"
- "traefik.http.routers.pusher-ssl.rule=Host(`pusher.workadventure.localhost`)" - "traefik.http.routers.pusher-ssl.rule=Host(`pusher.kraut.world`)"
- "traefik.http.routers.pusher-ssl.entryPoints=websecure" - "traefik.http.routers.pusher-ssl.entryPoints=websecure"
- "traefik.http.routers.pusher-ssl.tls=true" - "traefik.http.routers.pusher-ssl.tls=true"
- "traefik.http.routers.pusher-ssl.service=pusher" - "traefik.http.routers.pusher-ssl.service=pusher"
- "traefik.http.routers.pusher-ssl.tls.certresolver=le"
- "traefik.http.routers.pusher-ssl.tls.domains[0].main=pusher.kraut.world"
maps: maps:
image: thecodingmachine/nodejs:12-apache image: thecodingmachine/nodejs:12-apache
@ -85,13 +94,15 @@ services:
volumes: volumes:
- ./maps:/var/www/html - ./maps:/var/www/html
labels: labels:
- "traefik.http.routers.maps.rule=Host(`maps.workadventure.localhost`)" - "traefik.http.routers.maps.rule=Host(`maps.kraut.world`)"
- "traefik.http.routers.maps.entryPoints=web,traefik" - "traefik.http.routers.maps.entryPoints=web,traefik"
- "traefik.http.services.maps.loadbalancer.server.port=80" - "traefik.http.services.maps.loadbalancer.server.port=80"
- "traefik.http.routers.maps-ssl.rule=Host(`maps.workadventure.localhost`)" - "traefik.http.routers.maps-ssl.rule=Host(`maps.kraut.world`)"
- "traefik.http.routers.maps-ssl.entryPoints=websecure" - "traefik.http.routers.maps-ssl.entryPoints=websecure"
- "traefik.http.routers.maps-ssl.tls=true" - "traefik.http.routers.maps-ssl.tls=true"
- "traefik.http.routers.maps-ssl.service=maps" - "traefik.http.routers.maps-ssl.service=maps"
- "traefik.http.routers.maps-ssl.tls.certresolver=le"
- "traefik.http.routers.maps-ssl.tls.domains[0].main=maps.kraut.world"
back: back:
image: thecodingmachine/nodejs:12 image: thecodingmachine/nodejs:12
@ -109,13 +120,15 @@ services:
volumes: volumes:
- ./back:/usr/src/app - ./back:/usr/src/app
labels: labels:
- "traefik.http.routers.back.rule=Host(`api.workadventure.localhost`)" - "traefik.http.routers.back.rule=Host(`api.kraut.world`)"
- "traefik.http.routers.back.entryPoints=web" - "traefik.http.routers.back.entryPoints=web"
- "traefik.http.services.back.loadbalancer.server.port=8080" - "traefik.http.services.back.loadbalancer.server.port=8080"
- "traefik.http.routers.back-ssl.rule=Host(`api.workadventure.localhost`)" - "traefik.http.routers.back-ssl.rule=Host(`api.kraut.world`)"
- "traefik.http.routers.back-ssl.entryPoints=websecure" - "traefik.http.routers.back-ssl.entryPoints=websecure"
- "traefik.http.routers.back-ssl.tls=true" - "traefik.http.routers.back-ssl.tls=true"
- "traefik.http.routers.back-ssl.service=back" - "traefik.http.routers.back-ssl.service=back"
- "traefik.http.routers.back-ssl.tls.certresolver=le"
- "traefik.http.routers.back-ssl.tls.domains[0].main=api.kraut.world"
uploader: uploader:
image: thecodingmachine/nodejs:12 image: thecodingmachine/nodejs:12
@ -127,13 +140,15 @@ services:
volumes: volumes:
- ./uploader:/usr/src/app - ./uploader:/usr/src/app
labels: labels:
- "traefik.http.routers.uploader.rule=Host(`uploader.workadventure.localhost`)" - "traefik.http.routers.uploader.rule=Host(`uploader.kraut.world`)"
- "traefik.http.routers.uploader.entryPoints=web" - "traefik.http.routers.uploader.entryPoints=web"
- "traefik.http.services.uploader.loadbalancer.server.port=8080" - "traefik.http.services.uploader.loadbalancer.server.port=8080"
- "traefik.http.routers.uploader-ssl.rule=Host(`uploader.workadventure.localhost`)" - "traefik.http.routers.uploader-ssl.rule=Host(`uploader.kraut.world`)"
- "traefik.http.routers.uploader-ssl.entryPoints=websecure" - "traefik.http.routers.uploader-ssl.entryPoints=websecure"
- "traefik.http.routers.uploader-ssl.tls=true" - "traefik.http.routers.uploader-ssl.tls=true"
- "traefik.http.routers.uploader-ssl.service=uploader" - "traefik.http.routers.uploader-ssl.service=uploader"
- "traefik.http.routers.uploader-ssl.tls.certresolver=le"
- "traefik.http.routers.uploader-ssl.tls.domains[0].main=uploader.kraut.world"
website: website:
image: thecodingmachine/nodejs:12-apache image: thecodingmachine/nodejs:12-apache
@ -144,13 +159,15 @@ services:
volumes: volumes:
- ./website:/var/www/html - ./website:/var/www/html
labels: labels:
- "traefik.http.routers.website.rule=Host(`workadventure.localhost`)" - "traefik.http.routers.website.rule=Host(`kraut.world`)"
- "traefik.http.routers.website.entryPoints=web" - "traefik.http.routers.website.entryPoints=web"
- "traefik.http.services.website.loadbalancer.server.port=80" - "traefik.http.services.website.loadbalancer.server.port=80"
- "traefik.http.routers.website-ssl.rule=Host(`workadventure.localhost`)" - "traefik.http.routers.website-ssl.rule=Host(`kraut.world`)"
- "traefik.http.routers.website-ssl.entryPoints=websecure" - "traefik.http.routers.website-ssl.entryPoints=websecure"
- "traefik.http.routers.website-ssl.tls=true" - "traefik.http.routers.website-ssl.tls=true"
- "traefik.http.routers.website-ssl.service=website" - "traefik.http.routers.website-ssl.service=website"
- "traefik.http.routers.website-ssl.tls.certresolver=le"
- "traefik.http.routers.website-ssl.tls.domains[0].main=kraut.world"
messages: messages:
#image: thecodingmachine/nodejs:14 #image: thecodingmachine/nodejs:14

View File

@ -59,7 +59,7 @@
window.open(playUrl, '_blank'); window.open(playUrl, '_blank');
} }
function startGame() { function startGame() {
let playUrl = window.location.protocol + "//play."+window.location.host+'/_/global/npeguin.github.io/office-map/map.json'; let playUrl = window.location.protocol + "//play."+window.location.host+'/_/global/raw.githubusercontent.com/HackspaceJena/krautspace-rc3-map/main/main.json';
window.open(playUrl, '_blank'); window.open(playUrl, '_blank');
} }
function shareFB() { function shareFB() {