diff --git a/docker-compose.yaml b/docker-compose.yaml index 7ad56168..4f805968 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,8 +3,8 @@ services: reverse-proxy: image: traefik:v2.0 command: - - --log.level=DEBUG - - --api.insecure=true + # - --log.level=DEBUG + - --api.insecure=false - --providers.docker - --entryPoints.web.address=:80 - --entryPoints.websecure.address=:443 @@ -43,7 +43,7 @@ services: - ./front:/usr/src/app labels: - "traefik.http.routers.front.rule=Host(`play.kraut.world`)" - - "traefik.http.routers.front.entryPoints=web,traefik" + - "traefik.http.routers.front.entryPoints=web" - "traefik.http.services.front.loadbalancer.server.port=8080" - "traefik.http.routers.front-ssl.rule=Host(`play.kraut.world`)" - "traefik.http.routers.front-ssl.entryPoints=websecure" @@ -51,6 +51,21 @@ services: - "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" + # kraut.world - redirects + - "traefik.http.middlewares.website-redirect.redirectregex.regex=^.*" + - "traefik.http.middlewares.website-redirect.redirectregex.replacement=https://play.kraut.world/_/global/raw.githubusercontent.com/HackspaceJena/krautspace-rc3-map/main/maps/kraut.space_e1.json" + # http + - "traefik.http.routers.website.rule=Host(`kraut.world`)" + - "traefik.http.routers.website.entryPoints=web" + - "traefik.http.routers.website.middlewares=website-redirect" + # https + - "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=front" + - "traefik.http.routers.website-ssl.tls.certresolver=le" + - "traefik.http.routers.website-ssl.tls.domains[0].main=kraut.world" + - "traefik.http.routers.website-ssl.middlewares=website-redirect" pusher: image: thecodingmachine/nodejs:12 @@ -84,7 +99,7 @@ services: environment: DEBUG_MODE: "$DEBUG_MODE" HOST: "0.0.0.0" - NODE_ENV: development + NODE_ENV: "$NODE_ENV" #APACHE_DOCUMENT_ROOT: dist/ #APACHE_EXTENSIONS: headers #APACHE_EXTENSION_HEADERS: 1 @@ -95,7 +110,7 @@ services: - ./maps:/var/www/html labels: - "traefik.http.routers.maps.rule=Host(`maps.kraut.world`)" - - "traefik.http.routers.maps.entryPoints=web,traefik" + - "traefik.http.routers.maps.entryPoints=web" - "traefik.http.services.maps.loadbalancer.server.port=80" - "traefik.http.routers.maps-ssl.rule=Host(`maps.kraut.world`)" - "traefik.http.routers.maps-ssl.entryPoints=websecure" @@ -150,24 +165,26 @@ services: - "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 - environment: - STARTUP_COMMAND_1: npm install - STARTUP_COMMAND_2: npm run watch & - APACHE_DOCUMENT_ROOT: dist/ - volumes: - - ./website:/var/www/html - labels: - - "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(`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" +# website: +# image: thecodingmachine/nodejs:12-apache +# environment: +# STARTUP_COMMAND_1: npm install +# STARTUP_COMMAND_2: npm run watch & +# APACHE_DOCUMENT_ROOT: dist/ +# volumes: +# - ./website:/var/www/html +# labels: +# - "traefik.http.middlewares.https-upgrade.redirectscheme.scheme=https" +# - "traefik.http.routers.website.rule=Host(`kraut.world`)" +# - "traefik.http.routers.website.entryPoints=web" +# - "traefik.http.routers.website.middlewares=https-upgrade@docker" +# - "traefik.http.services.website.loadbalancer.server.port=80" +# - "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