Remove clutter

2021-04-29 11:26:15 +02:00
parent 3fa7f9e930
commit 91451e2fd5
7 changed files with 7 additions and 45 deletions
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@ -61,18 +61,11 @@ services:
      - "traefik.http.routers.gitea.tls=true"
      - "traefik.http.routers.gitea.tls.certresolver=myresolver"
      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-<<<<<<< HEAD
-      - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
-      - "traefik.tcp.routers.gitea-ssh.entrypoints=ssh"
-      - "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc"
-      - "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222"
-=======
      # SSH
      #- "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
      #- "traefik.tcp.routers.gitea-ssh.entrypoints=ssh"
      #- "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-svc"
      #- "traefik.tcp.services.gitea-ssh-svc.loadbalancer.server.port=2222"
->>>>>>> 5de4093a2960c08d427742f1fd7053da76d5d9d3
    depends_on:
      - gitea-db
    networks: