From acef6246d0b04219bc8a6be2302b6aba5c464955 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Tue, 1 Sep 2020 19:43:44 +0100
Subject: [PATCH] Replace gitea with gitlab

Leave gitea in place for a bit in case I need to change back suddenly
---
 ansible/roles/gitlab/files/docker-compose.yml    |  2 +-
 ansible/roles/gitlab/files/gitlab.rb             |  2 +-
 .../files/gitea/docker-compose.yml               | 16 ----------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/ansible/roles/gitlab/files/docker-compose.yml b/ansible/roles/gitlab/files/docker-compose.yml
index eef113b..78f12b4 100644
--- a/ansible/roles/gitlab/files/docker-compose.yml
+++ b/ansible/roles/gitlab/files/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       - "{{ wireguard.clients.intersect.ip }}:8022:22"
     labels:
       - traefik.enable=true
-      - traefik.http.routers.gitlab.rule=Host(`gitlab.theorangeone.net`)
+      - traefik.http.routers.gitlab.rule=Host(`git.theorangeone.net`) || Host(`git.0rng.one`)
       - traefik.http.routers.gitlab.tls.certresolver=le
       - traefik.http.services.gitlab-gitlab.loadbalancer.server.port=80
       - traefik.http.services.gitlab-gitlab.loadbalancer.server.scheme=http
diff --git a/ansible/roles/gitlab/files/gitlab.rb b/ansible/roles/gitlab/files/gitlab.rb
index d640d16..d2ee022 100644
--- a/ansible/roles/gitlab/files/gitlab.rb
+++ b/ansible/roles/gitlab/files/gitlab.rb
@@ -1,4 +1,4 @@
-external_url 'https://gitlab.theorangeone.net'
+external_url 'https://git.theorangeone.net'
 nginx['redirect_http_to_https'] = false
 nginx['listen_https'] = false
 nginx['listen_port'] = 80
diff --git a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml b/ansible/roles/intersect-docker/files/gitea/docker-compose.yml
index f607df0..0a1d54c 100644
--- a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml
+++ b/ansible/roles/intersect-docker/files/gitea/docker-compose.yml
@@ -7,11 +7,6 @@ services:
     environment:
       - USER_UID={{ docker_user.id }}
       - USER_GID={{ docker_user.id }}
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.gitea.rule=(Host(`git.theorangeone.net`) || Host(`git.0rng.one`))
-      - traefik.http.routers.gitea.tls.certresolver=le
-      - traefik.http.services.gitea-gitea.loadbalancer.server.port=3000
     ports:
       - "{{ wireguard.clients.intersect.ip }}:3022:3022"
     depends_on:
@@ -45,14 +40,3 @@ services:
       - POSTGRES_DB=gitea
       - BACKUP_KEEP_MONTHS=1
       - BACKUP_KEEP_WEEKS=1
-
-  git-mirror:
-    image: theorangeone/git-mirror:latest
-    restart: unless-stopped
-    volumes:
-      - /mnt/tank/app-data/git-mirror/repositories.toml:/app/repositories.toml:ro
-      - /scratch/git-mirror:/app/repos
-    environment:
-      - GITHUB_TOKEN={{ gitea.git_mirror_github_token }}
-    depends_on:
-      - gitea