From a62c6c04453a7df0c9df0323f21ed4a6949dbbe3 Mon Sep 17 00:00:00 2001
From: Conor Flynn <conor.j.flynn@gmail.com>
Date: Tue, 11 Jul 2023 22:28:29 +0200
Subject: [PATCH] Addresses PR Feedback

---
 .../traefik/docker-compose.traefik.yml        | 46 ++-----------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/reverse-proxy/traefik/docker-compose.traefik.yml b/reverse-proxy/traefik/docker-compose.traefik.yml
index 19963f5..4bea4b8 100644
--- a/reverse-proxy/traefik/docker-compose.traefik.yml
+++ b/reverse-proxy/traefik/docker-compose.traefik.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: "3.3"
 
 networks:
   live_network:
@@ -7,35 +7,6 @@ networks:
     external: false
 
 services:
-  traefik:
-    container_name: "traefik"
-    image: "traefik:v2.9"
-
-    networks:
-      - "live_network"
-      - "internal_network"
-
-    restart: unless-stopped
-
-    command:
-      - "--entrypoints.web.address=:80"
-      - "--entrypoints.websecure.address=:443"
-      - "--providers.docker=true"
-      - "--certificatesresolvers.le.acme.email=example@example.com"  # Add your email address here
-      - "--certificatesresolvers.le.acme.storage=/data/acme.json"
-      - "--certificatesresolvers.le.acme.tlschallenge=true"
-
-    ports:
-      - "80:80"
-      - "443:443"
-
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "./data:/data"
-
-    labels:
-      - "traefik.enable=false"
-
   rallly:
     container_name: "rallly"
     image: lukevella/rallly:latest
@@ -53,23 +24,13 @@ services:
       - DATABASE_URL=postgres://postgres:postgres@rallly-db:5432/db
 
     env_file:
-      - ./config/rallly.env
+      - ./config/rallly.env  # TODO: Replace this with the location of your rallly env file.
 
     labels:
       - "traefik.enable=true"
+      - "traefik.http.routers.rallly-websecure.rule=Host(`rallly.example.com`)"  # TODO: Add your domain here
       - "traefik.http.services.rallly.loadbalancer.server.port=3000"
-      - "traefik.docker.network=live_network"
-
-      - "traefik.http.routers.rallly-websecure.rule=Host(`rallly.example.com`)"  # Add your domain here
       - "traefik.http.routers.rallly-websecure.entrypoints=websecure"
-      - "traefik.http.routers.rallly-websecure.tls=true"
-      - "traefik.http.routers.rallly-websecure.tls.certresolver=le"
-
-      - "traefik.http.routers.rallly-web.rule=Host(`rallly.example.com`)"  # Add your domain here
-      - "traefik.http.routers.rallly-web.entrypoints=web"
-      - "traefik.http.routers.rallly-web.middlewares=rallly-http-redirect"
-
-      - "traefik.http.middlewares.rallly-http-redirect.redirectscheme.scheme=https"
 
   rallly-db:
     container_name: "rallly-db"
@@ -88,6 +49,7 @@ services:
 
     labels:
       - "traefik.enable=false"
+
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 5s