From b91c644179636924df54875d001bec7bbe74eb37 Mon Sep 17 00:00:00 2001 From: Teck Meng Date: Fri, 1 Mar 2024 12:55:38 +0800 Subject: [PATCH] Update Traefik configuration and add site server --- compose/traefik/traefik.yml | 24 ++++++++++++++++-------- production.yml | 12 ++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/compose/traefik/traefik.yml b/compose/traefik/traefik.yml index 104c3c8..8237f99 100644 --- a/compose/traefik/traefik.yml +++ b/compose/traefik/traefik.yml @@ -46,10 +46,6 @@ http: tls: # https://docs.traefik.io/master/routing/routers/#certresolver certResolver: letsencrypt - # domains: - # - main: "furyhawk.lol" - # sans: - # - "*.furyhawk.lol" web-secure-router: rule: "Host(`furyhawk.lol`, `www.furyhawk.lol`, `bai.furyhawk.lol`)" @@ -63,10 +59,7 @@ http: tls: # https://docs.traefik.io/master/routing/routers/#certresolver certResolver: letsencrypt - # domains: - # - main: "furyhawk.lol" - # sans: - # - "*.furyhawk.lol" + fin-router: rule: "Host(`fin.furyhawk.lol`)" entryPoints: @@ -82,6 +75,17 @@ http: # - main: "furyhawk.lol" # sans: # - "*.furyhawk.lol" + info-router: + rule: "Host(`info.furyhawk.lol`)" + entryPoints: + - web-secure + middlewares: + - csrf + service: site_server + tls: + # https://docs.traefik.io/master/routing/routers/#certresolver + certResolver: letsencrypt + blog-router: rule: "Host(`blog.furyhawk.lol`)" entryPoints: @@ -153,6 +157,10 @@ http: loadBalancer: servers: - url: http://streamlit_fin_app:8501 + site_server: + loadBalancer: + servers: + - url: http://site_server:80 blog: loadBalancer: servers: diff --git a/production.yml b/production.yml index 7c005e6..26ca67d 100644 --- a/production.yml +++ b/production.yml @@ -70,6 +70,18 @@ services: - default command: streamlit run --server.port=$STREAMLIT_FIN_SERVER_PORT --server.address=0.0.0.0 --server.baseUrlPath=$FIN_LOCATION src/app.py + site_server: + image: nginx:alpine + container_name: site_server + restart: unless-stopped + volumes: + - ./site:/usr/share/nginx/html:ro + networks: + - net + - default + expose: + - 80 + traefik: environment: <<: *default-environment