From ce3ab9f5f281523871312057ba17900e7ae2a0d7 Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer@protonmail.com>
Date: Sun, 27 Oct 2024 16:42:04 +0100
Subject: [PATCH] Git: Use more generic terms

---
 roles/gitea/templates/docker-compose.yml | 25 ++++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/roles/gitea/templates/docker-compose.yml b/roles/gitea/templates/docker-compose.yml
index 6f9172d..c03bb3d 100644
--- a/roles/gitea/templates/docker-compose.yml
+++ b/roles/gitea/templates/docker-compose.yml
@@ -1,5 +1,5 @@
 services:
-  gitea:
+  web:
     image: gitea/gitea:latest
     environment:
       - USER_UID=1000
@@ -8,7 +8,6 @@ services:
       - GITEA__actions__ENABLED=true
       - GITEA__actions__DEFAULT_ACTIONS_URL=self
       - GITEA__packages__ENABLED=true
-    container_name: gitea
     restart: unless-stopped
     volumes:
       - {{ server.work_dir }}/gitea/data/:/data
@@ -21,17 +20,17 @@ services:
       - traefik.enable=true
       - traefik.docker.network=proxy
       # HTTP Reverse proxy Gitea
-      - traefik.http.routers.gitea-secure.entrypoints=https
-      - traefik.http.routers.gitea-secure.rule=Host(`gitea.{{ server.domain }}`) || Host(`git.{{ server.domain }}`)
-      - traefik.http.routers.gitea-secure.tls=true
-      - traefik.http.routers.gitea-secure.tls.certresolver=sslResolver
-      - traefik.http.routers.gitea-secure.service=gitea
-      - traefik.http.services.gitea.loadbalancer.server.port=3000
+      - traefik.http.routers.git-secure.entrypoints=https
+      - traefik.http.routers.git-secure.rule=Host(`gitea.{{ server.domain }}`) || Host(`git.{{ server.domain }}`)
+      - traefik.http.routers.git-secure.tls=true
+      - traefik.http.routers.git-secure.tls.certresolver=sslResolver
+      - traefik.http.routers.git-secure.service=git
+      - traefik.http.services.git.loadbalancer.server.port=3000
       # TCP SSH Reverse proxy Gitea
-      - traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)
-      - traefik.tcp.routers.gitea-ssh.entrypoints=ssh
-      - traefik.tcp.routers.gitea-ssh.service=gitea-ssh
-      - traefik.tcp.services.gitea-ssh.loadbalancer.server.port=22
+      - traefik.tcp.routers.git-ssh.rule=HostSNI(`*`)
+      - traefik.tcp.routers.git-ssh.entrypoints=ssh
+      - traefik.tcp.routers.git-ssh.service=git-ssh
+      - traefik.tcp.services.git-ssh.loadbalancer.server.port=22
     logging:
       driver: loki
       options:
@@ -42,7 +41,7 @@ services:
     image: gitea/act_runner
     restart: unless-stopped
     depends_on:
-      - gitea
+      - web
     volumes:
       - ./config.yml:/config.yml
       - {{ server.work_dir }}/gitea/runner/:/data