From 1758d5a85cc98fd1d6567aed2c389d753cb4b400 Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Sat, 26 Aug 2023 11:48:45 +0100
Subject: [PATCH] chore(traefik): move traefik config to traefik

Move codeflow traefik configuration template over to the traefik
template directory.
---
 templates/forgejo/Dockerfile.gotmpl                          | 4 +---
 templates/forgejo/entrypoint.sh.gotmpl                       | 5 -----
 templates/traefik/Dockerfile.gotmpl                          | 2 ++
 .../dynamic_forgejo.yaml.gotmpl}                             | 0
 4 files changed, 3 insertions(+), 8 deletions(-)
 rename templates/{forgejo/dynamic_git.yaml.gotmpl => traefik/dynamic_forgejo.yaml.gotmpl} (100%)

diff --git a/templates/forgejo/Dockerfile.gotmpl b/templates/forgejo/Dockerfile.gotmpl
index 70a60de..2e588c1 100644
--- a/templates/forgejo/Dockerfile.gotmpl
+++ b/templates/forgejo/Dockerfile.gotmpl
@@ -31,9 +31,7 @@ RUN --mount=type=bind,source=.,target=/packages \
     && chown {{ .Forgejo.LinuxUID }}:{{ .Forgejo.LinuxUID }} {{ .Forgejo.AppIni }} \
     && chmod 0400 {{ .Forgejo.AppIni }} \
     && cp /packages/entrypoint.sh /usr/local/bin/entrypoint \
-    && chmod a+rx /usr/local/bin/entrypoint \
-    && cp /packages/dynamic_git.yaml {{ .Forgejo.Tmp }}/dynamic_git.yaml \
-    && chown {{ .Forgejo.LinuxUID }}:{{ .FlowGID }} {{ .Forgejo.Tmp }}/dynamic_git.yaml
+    && chmod a+rx /usr/local/bin/entrypoint
 
 USER {{ .Forgejo.LinuxUID }}:{{ .FlowGID }}
 
diff --git a/templates/forgejo/entrypoint.sh.gotmpl b/templates/forgejo/entrypoint.sh.gotmpl
index a79cf5f..e6a7728 100644
--- a/templates/forgejo/entrypoint.sh.gotmpl
+++ b/templates/forgejo/entrypoint.sh.gotmpl
@@ -16,11 +16,6 @@ if ! [ -d {{ .Forgejo.Custom }} ]; then
     chmod 0500 {{ .Forgejo.Custom }}
 fi
 
-# Move the dynamic Traefik config to the shared volume.
-if [ -f /flow/gitea/tmp/dynamic_git.yaml ]; then
-    mv /flow/gitea/tmp/dynamic_git.yaml {{ .Traefik.SharedMountPoint }}/dynamic/dynamic_git.yaml
-fi
-
 if [ $# -gt 0 ]; then
     exec "$@"
 else
diff --git a/templates/traefik/Dockerfile.gotmpl b/templates/traefik/Dockerfile.gotmpl
index 4f1aaf0..9a5905e 100644
--- a/templates/traefik/Dockerfile.gotmpl
+++ b/templates/traefik/Dockerfile.gotmpl
@@ -9,6 +9,8 @@ ADD dynamic_gotosocial.yaml /tmp/dynamic_gotosocial.yaml
 
 ADD dynamic_woodpecker.yaml /tmp/dynamic_woodpecker.yaml
 
+ADD dynamic_forgejo.yaml /tmp/dynamic_forgejo.yaml
+
 ADD entrypoint.sh /
 
 RUN chmod +x /entrypoint.sh
diff --git a/templates/forgejo/dynamic_git.yaml.gotmpl b/templates/traefik/dynamic_forgejo.yaml.gotmpl
similarity index 100%
rename from templates/forgejo/dynamic_git.yaml.gotmpl
rename to templates/traefik/dynamic_forgejo.yaml.gotmpl