From 2fb49d6ff47bd01d7203d51cea8b97764813e202 Mon Sep 17 00:00:00 2001
From: whitney <whitney.server@gmail.com>
Date: Wed, 20 Dec 2023 13:58:20 -0800
Subject: [PATCH] Fixed all that traefik configuration stuff. Manual disable of
 traefik in the containers that don't use it.

---
 gitea/README.md                    | 3 ++-
 gitea/docker-compose.yml.blanked   | 2 +-
 grafana/docker-compose.yml.blanked | 2 +-
 traefik/docker-compose.yml         | 8 ++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gitea/README.md b/gitea/README.md
index 75322e1..2e8b342 100644
--- a/gitea/README.md
+++ b/gitea/README.md
@@ -36,7 +36,8 @@ Also modify the following:
 
 Then start containers again.
 
-5. Go to xxx.xxx.xx.xxx:3300 and fill out initial config.
+5. Go to xxx.xxx.xx.xxx:3300 and fill out initial config. Everything should match up to default values.
+
 
 Some things that were weird: 
 
diff --git a/gitea/docker-compose.yml.blanked b/gitea/docker-compose.yml.blanked
index b2499de..fac7886 100644
--- a/gitea/docker-compose.yml.blanked
+++ b/gitea/docker-compose.yml.blanked
@@ -35,7 +35,7 @@ services:
       - traefik.http.routers.gitea.rule=Host(`[[SITE_URL]]`)
       - traefik.http.routers.gitea.tls=true
       - traefik.http.routers.gitea.tls.certresolver=lets-encrypt
-      - traefik.http.services.gitea.loadbalancer.server.port=3000
+      - traefik.http.services.gitea.loadbalancer.server.port=[[HOST_PORT]]
       - traefik.port=[[HOST_PORT]]
 
   database:
diff --git a/grafana/docker-compose.yml.blanked b/grafana/docker-compose.yml.blanked
index a03d6c1..3e0394e 100644
--- a/grafana/docker-compose.yml.blanked
+++ b/grafana/docker-compose.yml.blanked
@@ -30,7 +30,7 @@ services:
       - traefik.http.routers.grafana.rule=Host(`[[SITE_URL]]`)
       - traefik.http.routers.grafana.tls=true
       - traefik.http.routers.grafana.tls.certresolver=lets-encrypt
-      - traefik.http.services.grafana.loadbalancer.server.port=3000
+      - traefik.http.services.grafana.loadbalancer.server.port=[[HOST_PORT]]
       - traefik.port=[[HOST_PORT]]
     depends_on:
       - node_exporter
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 82cc21e..e9fe74d 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -1,16 +1,16 @@
 version: "3"
 
 networks:
-  traefik-network:
+  traefik_traefik-network:
+    external: true
 
 services:
-
   traefik:
     image: traefik:v2.9
     container_name: traefik
     restart: always
     networks:
-      - traefik-network
+      - traefik_traefik-network
     ports:
       - 80:80
       - 8080:8080
@@ -25,7 +25,7 @@ services:
     image: traefik/whoami
     container_name: whoami_traefik
     networks:
-      - traefik-network
+      - traefik_traefik-network
     labels:
       - traefik.http.routers.whoami.rule=Host(`whoami.whitney.rip`)
       - traefik.http.routers.whoami.tls=true