Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extended intro page, removed trafik based redirect

Browse source
This commit is contained in:
Ludwig Behm 2021-01-11 22:40:05 +01:00
parent 33aa153743
commit 5c87903a37
4 changed files with 42 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

55
docker-compose.yaml
View file

@ -51,21 +51,6 @@ 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
@ -165,26 +150,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.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"
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