update the domains

docker-compose.production.yml

@@ -84,30 +84,34 @@ services:
     restart: unless-stopped
     labels:
       - traefik.enable=true
-      # public site (port 3003) — owns both bare and www domains
-      - traefik.http.routers.public-site.rule=Host(`${PUBLIC_SITE_DOMAIN}`) || Host(`www.${PUBLIC_SITE_DOMAIN}`)
-      - traefik.http.routers.public-site.entrypoints=websecure
-      - traefik.http.routers.public-site.tls.certresolver=letsencrypt
-      - traefik.http.routers.public-site.service=public-site-svc
-      - traefik.http.services.public-site-svc.loadbalancer.server.port=3003
-      # marketplace (port 3000) — should use its own subdomain
-      - traefik.http.routers.marketplace.rule=Host(`${MARKETPLACE_DOMAIN}`)
+      # marketplace (port 3000) — /marketplace path, priority 20
+      - traefik.http.routers.marketplace.rule=Host(`${PUBLIC_SITE_DOMAIN}`) && PathPrefix(`/marketplace`)
+      - traefik.http.routers.marketplace.priority=20
       - traefik.http.routers.marketplace.entrypoints=websecure
       - traefik.http.routers.marketplace.tls.certresolver=letsencrypt
       - traefik.http.routers.marketplace.service=marketplace-svc
       - traefik.http.services.marketplace-svc.loadbalancer.server.port=3000
-      # admin (port 3002)
-      - traefik.http.routers.admin.rule=Host(`${ADMIN_DOMAIN}`)
-      - traefik.http.routers.admin.entrypoints=websecure
-      - traefik.http.routers.admin.tls.certresolver=letsencrypt
-      - traefik.http.routers.admin.service=admin-svc
-      - traefik.http.services.admin-svc.loadbalancer.server.port=3002
-      # dashboard (port 3001)
-      - traefik.http.routers.dashboard.rule=Host(`${DASHBOARD_DOMAIN}`)
+      # dashboard (port 3001) — /dashboard path, priority 20
+      - traefik.http.routers.dashboard.rule=Host(`${PUBLIC_SITE_DOMAIN}`) && PathPrefix(`/dashboard`)
+      - traefik.http.routers.dashboard.priority=20
       - traefik.http.routers.dashboard.entrypoints=websecure
       - traefik.http.routers.dashboard.tls.certresolver=letsencrypt
       - traefik.http.routers.dashboard.service=dashboard-svc
       - traefik.http.services.dashboard-svc.loadbalancer.server.port=3001
+      # admin (port 3002) — /admin path, priority 20
+      - traefik.http.routers.admin.rule=Host(`${PUBLIC_SITE_DOMAIN}`) && PathPrefix(`/admin`)
+      - traefik.http.routers.admin.priority=20
+      - traefik.http.routers.admin.entrypoints=websecure
+      - traefik.http.routers.admin.tls.certresolver=letsencrypt
+      - traefik.http.routers.admin.service=admin-svc
+      - traefik.http.services.admin-svc.loadbalancer.server.port=3002
+      # public site (port 3003) — root domain + tenant subdomains, priority 10
+      - traefik.http.routers.public-site.rule=Host(`${PUBLIC_SITE_DOMAIN}`) || Host(`www.${PUBLIC_SITE_DOMAIN}`) || HostRegexp(`{subdomain:[a-z0-9-]+}.${PUBLIC_SITE_DOMAIN}`)
+      - traefik.http.routers.public-site.priority=10
+      - traefik.http.routers.public-site.entrypoints=websecure
+      - traefik.http.routers.public-site.tls.certresolver=letsencrypt
+      - traefik.http.routers.public-site.service=public-site-svc
+      - traefik.http.services.public-site-svc.loadbalancer.server.port=3003
 
   pgmanage:
     image: cmdpromptinc/pgmanage-enterprise:latest