diff --git a/.gitignore b/.gitignore index 70660058..5906a6f4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,9 @@ .idea .vagrant Vagrantfile +letsencrypt docker-compose.override.yaml *.DS_Store maps/yarn.lock maps/dist/computer.js -maps/dist/computer.js.map \ No newline at end of file +maps/dist/computer.js.map diff --git a/docker-compose.yaml b/docker-compose.yaml index 582ce142..7ad56168 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,10 +3,14 @@ services: reverse-proxy: image: traefik:v2.0 command: + - --log.level=DEBUG - --api.insecure=true - --providers.docker - --entryPoints.web.address=:80 - --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: - "80:80" - "443:443" @@ -17,6 +21,7 @@ services: - front volumes: - /var/run/docker.sock:/var/run/docker.sock + - ./letsencrypt:/letsencrypt front: image: thecodingmachine/nodejs:14 @@ -26,9 +31,9 @@ services: JITSI_PRIVATE_MODE: "$JITSI_PRIVATE_MODE" HOST: "0.0.0.0" NODE_ENV: development - API_URL: pusher.workadventure.localhost - UPLOADER_URL: uploader.workadventure.localhost - ADMIN_URL: admin.workadventure.localhost + API_URL: pusher.kraut.world + UPLOADER_URL: uploader.kraut.world + ADMIN_URL: admin.kraut.world STARTUP_COMMAND_1: yarn install TURN_SERVER: "turn:coturn.workadventu.re:443,turns:coturn.workadventu.re:443" TURN_USER: workadventure @@ -37,13 +42,15 @@ services: volumes: - ./front:/usr/src/app 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.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.tls=true" - "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: image: thecodingmachine/nodejs:12 @@ -62,13 +69,15 @@ services: volumes: - ./pusher:/usr/src/app 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.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.tls=true" - "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: image: thecodingmachine/nodejs:12-apache @@ -85,13 +94,15 @@ services: volumes: - ./maps:/var/www/html 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.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.tls=true" - "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: image: thecodingmachine/nodejs:12 @@ -109,13 +120,15 @@ services: volumes: - ./back:/usr/src/app 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.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.tls=true" - "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: image: thecodingmachine/nodejs:12 @@ -127,13 +140,15 @@ services: volumes: - ./uploader:/usr/src/app 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.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.tls=true" - "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: image: thecodingmachine/nodejs:12-apache @@ -144,13 +159,15 @@ services: volumes: - ./website:/var/www/html 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.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.tls=true" - "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: #image: thecodingmachine/nodejs:14 diff --git a/website/dist/index.html b/website/dist/index.html index f51eedaa..1bfeee0b 100644 --- a/website/dist/index.html +++ b/website/dist/index.html @@ -59,7 +59,7 @@ window.open(playUrl, '_blank'); } 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'); } function shareFB() {