From a42cc8de716b06f77619ce4bf62a824b2309d972 Mon Sep 17 00:00:00 2001
From: Andrei Boyanov <andrei.boyanov@gmail.com>
Date: Sat, 3 May 2025 20:18:26 +0200
Subject: [PATCH] Update docker-compose.yml

Signed-off-by: Andrei Boyanov <andrei.boyanov@gmail.com>
---
 docker-compose.yml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7fe5496..5c299d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,22 +8,27 @@ services:
       - "443:443"
       - "8080:8080"
     command:
-      - "--api.dashboard=true"
       - "--api.insecure=true"
       - "--providers.docker=true"
       - "--providers.docker.network=web"
       - "--providers.docker.exposedbydefault=false"
+      - "--providers.file.filename=/etc/traefik/tls.yml"
+      - "--providers.file.watch=true"
       - "--entrypoints.web.address=:80"
       - "--entrypoints.websecure.address=:443"
       - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
       - "--certificatesresolvers.myresolver.acme.email=you@example.com"
       - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
+      - "--entrypoints.websecure.http.tls=true"
+      - "--entrypoints.websecure.http.tls.domains[0].main=emf1995.club"
       - "--log.level=DEBUG"
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - "./letsencrypt:/letsencrypt"
     networks:
       - web
+    depends_on:
+      - odoo
   db:
     image: postgres:17
     container_name: db-prod
@@ -35,6 +40,8 @@ services:
     restart: always
     volumes:
         - ./postgresql:/var/lib/postgresql/data
+    networks:
+      - backend
 
   odoo:
     image: odoo:18
@@ -54,9 +61,20 @@ services:
       - PIP_BREAK_SYSTEM_PACKAGES=1
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.odoo-http.rule=Host(`vmi2561932.contaboserver.net`)"
+      - "traefik.docker.network=web"
+
+      # HTTP router -> redirect
+      - "traefik.http.routers.odoo-http.rule=Host(`emf1995.club`)"
       - "traefik.http.routers.odoo-http.entrypoints=web"
-      - "traefik.http.routers.odoo-http.service=odoo"
+      - "traefik.http.routers.odoo-http.middlewares=redirect-to-https"
+
+      # Middleware
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+
+      # HTTPS router
+      - "traefik.http.routers.odoo-https.rule=Host(`emf1995.club`)"
+      - "traefik.http.routers.odoo-https.entrypoints=websecure"
+      - "traefik.http.routers.odoo-https.service=odoo"
       - "traefik.http.services.odoo.loadbalancer.server.port=8069"
     volumes:
       #- /etc/timezone:/etc/timezone:ro
@@ -67,8 +85,7 @@ services:
     restart: always
     networks:
       - web
-      - default
+      - backend
 networks:
   web:
-    external: false
-  default:
+  backend: