From 12c46e50b53d74720ddd495b10058b85f7f15152 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 29 Sep 2023 14:20:19 +0100 Subject: [PATCH] Decommission `grimes` Dokku will return, soon... --- ansible/group_vars/all/nebula.yml | 2 -- ansible/group_vars/all/vps-hosts.yml | 1 - ansible/host_vars/grimes/main.yml | 32 --------------------- ansible/host_vars/grimes/vault.yml | 12 -------- ansible/hosts | 1 - ansible/main.yml | 10 ------- ansible/roles/nebula/files/certs/grimes.crt | 20 ------------- ansible/roles/nebula/files/certs/grimes.key | 11 ------- terraform/context.tf | 1 - terraform/grafana_cloud.tf | 2 -- terraform/grimes_vps.tf | 29 ------------------- terraform/sys_domains.tf | 16 ----------- terraform/theorangeone.net.tf | 16 ----------- 13 files changed, 153 deletions(-) delete mode 100644 ansible/host_vars/grimes/main.yml delete mode 100644 ansible/host_vars/grimes/vault.yml delete mode 100644 ansible/roles/nebula/files/certs/grimes.crt delete mode 100644 ansible/roles/nebula/files/certs/grimes.key delete mode 100644 terraform/grimes_vps.tf diff --git a/ansible/group_vars/all/nebula.yml b/ansible/group_vars/all/nebula.yml index 08bed71..f7cea27 100644 --- a/ansible/group_vars/all/nebula.yml +++ b/ansible/group_vars/all/nebula.yml @@ -3,8 +3,6 @@ nebula: clients: casey: ip: 10.23.2.1 - grimes: - ip: 10.23.2.3 walker: ip: 10.23.2.4 ingress: diff --git a/ansible/group_vars/all/vps-hosts.yml b/ansible/group_vars/all/vps-hosts.yml index af4a4e8..555954b 100755 --- a/ansible/group_vars/all/vps-hosts.yml +++ b/ansible/group_vars/all/vps-hosts.yml @@ -1,4 +1,3 @@ "vps_hosts": "casey_ip": "213.219.38.11" - "grimes_ip": "104.238.172.209" "walker_ip": "192.248.168.230" diff --git a/ansible/host_vars/grimes/main.yml b/ansible/host_vars/grimes/main.yml deleted file mode 100644 index 7e1bdad..0000000 --- a/ansible/host_vars/grimes/main.yml +++ /dev/null @@ -1,32 +0,0 @@ -ssh_extra_allowed_users: dokku - -dokku_daemon_install: false -dokku_hostname: d.theorangeone.net -dokku_plugins: - - name: postgres - url: https://github.com/dokku/dokku-postgres.git - - - name: redis - url: https://github.com/dokku/dokku-redis.git - - - name: letsencrypt - url: https://github.com/dokku/dokku-letsencrypt.git - - - name: redirect - url: https://github.com/dokku/dokku-redirect.git - - - name: http-auth - url: https://github.com/dokku/dokku-http-auth.git - -# https://dokku.com/docs/advanced-usage/backup-recovery/ -restic_backup_locations: - - /home/dokku - - /var/lib/dokku/config - - /var/lib/dokku/data - - /var/lib/dokku/services - - /opt/db-auto-backup/backups - -restic_backup_excludes: - - /home/dokku/**/cache # Caches are big, don't need those - -restic_healthchecks_id: "{{ vault_restic_healthchecks_id }}" diff --git a/ansible/host_vars/grimes/vault.yml b/ansible/host_vars/grimes/vault.yml deleted file mode 100644 index 22839fb..0000000 --- a/ansible/host_vars/grimes/vault.yml +++ /dev/null @@ -1,12 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -35343036383263323932663736373236313935646135656437646566373637373933643631663466 -3234633065393161663761323330626230383633643865610a663064313938353131663833633534 -63353431633763313731316564363863343232623663383366386133383035343465383935626464 -3661373034663330360a653734363033663531383338343239636263626162353036333964383862 -38316636653961643638386162323466643032646663383866306565636234333431366538613930 -65376137353932393931333366373962663939656664373536653063666534653631663964366466 -61316232663430346237343165363461396661343836316137326238313437356562333038306235 -38613732356434326637383832303636666162316333366564346562656530343461326662666230 -63663535616461646539623863373631383630313533623138613530383334333939366638653131 -61666539316263396666616264636533633035393937623332653632663130326630303337643439 -336466346361336239333938636239306563 diff --git a/ansible/hosts b/ansible/hosts index 594edbd..16dd130 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -1,6 +1,5 @@ casey walker -grimes pve tang diff --git a/ansible/main.yml b/ansible/main.yml index 3047caf..27f4c15 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -18,7 +18,6 @@ - casey - ingress - walker - - grimes - tang roles: - role: geerlingguy.ntp @@ -31,7 +30,6 @@ - pve-docker - forrest - walker - - grimes - renovate - gitea-runner roles: @@ -47,7 +45,6 @@ - pve-docker - forrest - walker - - grimes roles: - db_auto_backup @@ -120,13 +117,6 @@ roles: - gitea_runner -- hosts: grimes - roles: - - nebula - - role: dokku_bot.ansible_dokku - become: true - - restic - - hosts: renovate roles: - renovate diff --git a/ansible/roles/nebula/files/certs/grimes.crt b/ansible/roles/nebula/files/certs/grimes.crt deleted file mode 100644 index 3205fc3..0000000 --- a/ansible/roles/nebula/files/certs/grimes.crt +++ /dev/null @@ -1,20 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -63633837623439346639323936306262626164653662373065666133363139616631316336323961 -6135306263303839346335373262646637613963643166360a396638363534643461373531363461 -32313433383466646630396661373430353238336365303234626636306338353764623534323738 -6362373163626433660a623134343362623838363034393934323131373531616363643439336437 -32343332313936623334626434643535363361346464653634366664363964386530376261663962 -61353031313937643130333836366366656432633036383730386364343566353031653164613630 -30343062383864613833333361353566313862316436313161303364656566353765643439323162 -65663534663137383033633666396163663739326130616536386263356465303062643366666331 -30353333643632306466653935626430373437613263333563656331383936623834643839303937 -34373537613165383137653431333562323233323563353362613430616332363265656335613361 -32376333393261336333616634356161656134636533636363313261613261613539353937373462 -32373166643739363034356436323630626431363335303366373566373939356332303563383839 -35303464623133666430333265633638383266343765356565626361376164323830653265333663 -38613762326432336635373933396138616566376330316534646236663833366139323064366632 -31316461316430633865613666363439343735663466383162326539353561366436663765623565 -34326539376437613130396462653431383335326661653938623636393634613434646333343132 -34363239303163306130633037653539306162353930393265313238366437323334636131333066 -34383463303136386436663138653962623238663038623938383364363931666134626161663265 -646366313463663161653337333634353035 diff --git a/ansible/roles/nebula/files/certs/grimes.key b/ansible/roles/nebula/files/certs/grimes.key deleted file mode 100644 index cd694bf..0000000 --- a/ansible/roles/nebula/files/certs/grimes.key +++ /dev/null @@ -1,11 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -30333230396339326639656262343232396664326430383664623232376535396462366133633532 -3437663638623965373461373162623831633566633030610a383130386634363132353034326535 -35643939393230343662646135363531376162373636363438353461363031643465643435363764 -6435333432616434660a363837336462616333643330653165333562636166363361336537333966 -64623363373861623362383938613638313836346335303261336333383634356666323265303961 -39356533343132306266643063396636373265633333366330666362626130396533326365336663 -63383839306265346532333439396134343332613664323638383835366437313362323464383033 -65306336616534663531633164653139313463666434636436376233633330326633333237343361 -34626535636230316437396638316232623230643866383962323766313763633734643837323736 -6239613865336261323961353239636134393237613733303133 diff --git a/terraform/context.tf b/terraform/context.tf index 75993d1..6be5bbf 100644 --- a/terraform/context.tf +++ b/terraform/context.tf @@ -3,7 +3,6 @@ resource "local_file" "hosts" { vps_hosts : { casey_ip : linode_instance.casey.ip_address, walker_ip : vultr_instance.walker.main_ip, - grimes_ip : vultr_instance.grimes.main_ip, } }) filename = "${path.module}/../ansible/group_vars/all/vps-hosts.yml" diff --git a/terraform/grafana_cloud.tf b/terraform/grafana_cloud.tf index d48a4e5..562806c 100644 --- a/terraform/grafana_cloud.tf +++ b/terraform/grafana_cloud.tf @@ -20,7 +20,6 @@ resource "grafana_synthetic_monitoring_check" "vps_ping" { for_each = { casey = linode_instance.casey.ip_address walker = vultr_instance.walker.main_ip - grimes = vultr_instance.grimes.main_ip } job = "${each.key} v4" @@ -42,7 +41,6 @@ resource "grafana_synthetic_monitoring_check" "vps_ping_v6" { for_each = { casey = split("/", linode_instance.casey.ipv6)[0] walker = vultr_instance.walker.v6_main_ip - grimes = vultr_instance.grimes.v6_main_ip } job = "${each.key} v6" diff --git a/terraform/grimes_vps.tf b/terraform/grimes_vps.tf deleted file mode 100644 index c89ccca..0000000 --- a/terraform/grimes_vps.tf +++ /dev/null @@ -1,29 +0,0 @@ -module "grimes_firewall" { - source = "./vultr_firewall/" - - description = "grimes" - ports = [ - "80/tcp", - "443/tcp", - "7743/tcp", - ] -} - -resource "vultr_instance" "grimes" { - plan = "vhf-1c-1gb" - region = "lhr" - hostname = "grimes" - firewall_group_id = module.grimes_firewall.firewall_group.id -} - -resource "vultr_reverse_ipv4" "grimes_reverse_ipv4" { - instance_id = vultr_instance.grimes.id - ip = vultr_instance.grimes.main_ip - reverse = "grimes.sys.theorangeone.net" -} - -resource "vultr_reverse_ipv6" "grimes_reverse_ipv6" { - instance_id = vultr_instance.grimes.id - ip = vultr_instance.grimes.v6_main_ip - reverse = "grimes.sys.theorangeone.net" -} diff --git a/terraform/sys_domains.tf b/terraform/sys_domains.tf index a2db87f..23e8657 100644 --- a/terraform/sys_domains.tf +++ b/terraform/sys_domains.tf @@ -14,14 +14,6 @@ resource "cloudflare_record" "sys_domain_walker" { ttl = 1 } -resource "cloudflare_record" "sys_domain_grimes" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "grimes.sys" - value = vultr_instance.grimes.main_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "sys_domain_casey_v6" { zone_id = cloudflare_zone.theorangeonenet.id name = "casey.sys" @@ -37,11 +29,3 @@ resource "cloudflare_record" "sys_domain_walker_v6" { type = "AAAA" ttl = 1 } - -resource "cloudflare_record" "sys_domain_grimes_v6" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "grimes.sys" - value = vultr_instance.grimes.v6_main_ip - type = "AAAA" - ttl = 1 -} diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf index 259ce9b..03ed850 100644 --- a/terraform/theorangeone.net.tf +++ b/terraform/theorangeone.net.tf @@ -181,22 +181,6 @@ resource "cloudflare_record" "theorangeonenet_privatebin" { ttl = 1 } -resource "cloudflare_record" "theorangeonenet_dokku" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "d" - value = cloudflare_record.sys_domain_grimes.hostname - type = "CNAME" - ttl = 1 -} - -resource "cloudflare_record" "theorangeonenet_dokku_wildcard" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "*.d" - value = cloudflare_record.theorangeonenet_dokku.hostname - type = "CNAME" - ttl = 1 -} - resource "cloudflare_record" "theorangeonenet_google_site_verification" { zone_id = cloudflare_zone.theorangeonenet.id name = "@"