From 37b8c48a7744deea7d366ba4a7526e08508b5498 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 2 Oct 2023 09:37:05 +0100
Subject: [PATCH] Remove legacy short domains

I never used them, and the certificate renewal didn't work anyway.
---
 .../files/whoami/docker-compose.yml           |  3 --
 ansible/roles/traefik/files/traefik.yml       |  2 --
 ansible/roles/upload/files/docker-compose.yml |  5 +---
 terraform/0rng.one.tf                         | 30 -------------------
 4 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/ansible/roles/pve_docker/files/whoami/docker-compose.yml b/ansible/roles/pve_docker/files/whoami/docker-compose.yml
index 65aeeb3..7bc0a57 100644
--- a/ansible/roles/pve_docker/files/whoami/docker-compose.yml
+++ b/ansible/roles/pve_docker/files/whoami/docker-compose.yml
@@ -7,9 +7,6 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.whoami.rule=Host(`whoami.theorangeone.net`)
-
-      - traefik.http.routers.0rng-whoami.rule=Host(`who.0rng.one`)
-      - traefik.http.routers.0rng-whoami.tls.certresolver=gandi
     networks:
       - default
       - traefik
diff --git a/ansible/roles/traefik/files/traefik.yml b/ansible/roles/traefik/files/traefik.yml
index a19b9d6..d09aa86 100644
--- a/ansible/roles/traefik/files/traefik.yml
+++ b/ansible/roles/traefik/files/traefik.yml
@@ -24,8 +24,6 @@ entryPoints:
             sans: "*.theorangeone.net"
           - main: jakehoward.tech
             sans: "*.jakehoward.tech"
-          - main: 0rng.one
-            sans: "*.0rng.one"
           {% if traefik_provider_dokku %}
           - main: d.theorangeone.net
             sans: "*.d.theorangeone.net"
diff --git a/ansible/roles/upload/files/docker-compose.yml b/ansible/roles/upload/files/docker-compose.yml
index f1634ae..326e771 100644
--- a/ansible/roles/upload/files/docker-compose.yml
+++ b/ansible/roles/upload/files/docker-compose.yml
@@ -26,9 +26,6 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.img.rule=Host(`img.theorangeone.net`)
-
-      - traefik.http.routers.0rng-img.tls.certresolver=gandi
-      - traefik.http.routers.0rng-img.rule=Host(`img.0rng.one`)
     networks:
       - default
       - traefik
@@ -42,7 +39,7 @@ services:
       - PUID={{ docker_user.id }}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.dl.rule=Host(`dl.theorangeone.net`) || Host(`dl.0rng.one`)
+      - traefik.http.routers.dl.rule=Host(`dl.theorangeone.net`)
     networks:
       - default
       - traefik
diff --git a/terraform/0rng.one.tf b/terraform/0rng.one.tf
index 8618540..f1fd2b5 100644
--- a/terraform/0rng.one.tf
+++ b/terraform/0rng.one.tf
@@ -2,36 +2,6 @@ resource "gandi_livedns_domain" "orngone" {
   name = "0rng.one"
 }
 
-resource "gandi_livedns_record" "orngone_git" {
-  zone = gandi_livedns_domain.orngone.id
-  name = "git"
-  type = "CNAME"
-  ttl  = 3600
-  values = [
-    "${cloudflare_record.theorangeonenet_git.hostname}."
-  ]
-}
-
-resource "gandi_livedns_record" "orngone_who" {
-  zone = gandi_livedns_domain.orngone.id
-  name = "who"
-  type = "CNAME"
-  ttl  = 3600
-  values = [
-    "${cloudflare_record.theorangeonenet_whoami.hostname}."
-  ]
-}
-
-resource "gandi_livedns_record" "orngone_img" {
-  zone = gandi_livedns_domain.orngone.id
-  name = "img"
-  type = "CNAME"
-  ttl  = 3600
-  values = [
-    "${cloudflare_record.theorangeonenet_img.hostname}."
-  ]
-}
-
 resource "gandi_livedns_record" "orngone_apex" {
   zone = gandi_livedns_domain.orngone.id
   name = "@"