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/wireguard.yml b/ansible/group_vars/all/wireguard.yml index 0a974e8..ec0bccb 100644 --- a/ansible/group_vars/all/wireguard.yml +++ b/ansible/group_vars/all/wireguard.yml @@ -111,24 +111,6 @@ wireguard: 6533393634663939350a313237386565313737346664333334653932663935653338623465383631 34646432373131626465653632613235363730353531363136333339383130346535313536636265 3631316663306563366137656364313266366237646665303362 - grimes: - ip: 10.23.0.3 - public_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 33366534626365633565643535316364323833343838343565393630623835613364653332383132 - 3534343731326435326631306233643030313332623764650a643130313366326431333630396231 - 34393037323366366364303365396538333638653439356430386633373337376630313539393938 - 6532333464353133650a323161303866323433393531366136613833363866376165653530653466 - 33383361623838343331313836356430386134323362383263336337613734323764653536346235 - 3631616364313539633733616339626136346663396261303066 - private_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65376264613431383537373762643730356331383631646162326466656633333936636135383361 - 6337353231646237316538346130393264636637336639620a336266656431363639613032663464 - 66623462636431326664656335653835303033653234336536623634323538613934633531353032 - 6637366330636561650a333162343039326466666536336536386332626563323739383964393237 - 32663861666162646232333333636366636461616265393738336631376234336461326134363430 - 3863323435343963353161653936323837633837613733646263 ingress: ip: 10.23.0.5 public_key: !vault | diff --git a/ansible/host_vars/grimes.yml b/ansible/host_vars/grimes.yml deleted file mode 100644 index c32dd2f..0000000 --- a/ansible/host_vars/grimes.yml +++ /dev/null @@ -1 +0,0 @@ -app_data_dir: . diff --git a/ansible/hosts b/ansible/hosts index 8c962e8..829d4a2 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -1,5 +1,4 @@ casey -grimes walker pve diff --git a/ansible/main.yml b/ansible/main.yml index fba2378..fa44d3d 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -13,7 +13,6 @@ - hosts: - pve - casey - - grimes - ingress - qbittorrent - walker @@ -26,7 +25,6 @@ when: ansible_os_family != 'Alpine' # https://github.com/ansible-collections/community.general/issues/781 - hosts: - - grimes - pve-docker - forrest - walker @@ -41,18 +39,11 @@ - docker_cleanup - hosts: - - grimes - pve-docker - walker roles: - traefik -- hosts: - - grimes - roles: - - duplicati - - nebula - - hosts: pve-docker roles: - pve_docker diff --git a/ansible/roles/nebula/files/certs/grimes.crt b/ansible/roles/nebula/files/certs/grimes.crt deleted file mode 100644 index 81401ad..0000000 --- a/ansible/roles/nebula/files/certs/grimes.crt +++ /dev/null @@ -1,20 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -62396266363965343862616666346261363037396339373464333733333638386637623934356562 -6539666139613134393030653261313164333930343639310a333031636462333731363464656335 -35383636643062626334623063613834643234623964306539646237323739353134373830396162 -6339393634336136320a386666376338376537356462393238656432353539663731376530633861 -33643230336239326332636230613265326432616636653730393363323739366165613264396638 -61366130646662653732353038356265623963386462303762373538656662346364613263653338 -63346462633764633664383837383130626565356433633032393333643038663438386361613861 -65643035346262306463333431663466326164336432613865356231333931663931376564646361 -37343132366238336332663834613230383239373065636438363866373737313139333735376339 -62353537636636353064613934313532633765613966366162356630623539366438616233323063 -37613038353930653561313261653033396336653532303834633961396534366163653864393235 -30356231376663363034616465316163336633363831613739306535356638663263303764386263 -61636333306435653666376363633939373935333133303630653139626161623732316336353036 -64303430613939616365363635366537653065383634393936333766306639366561323331373734 -39656163303461373133656534386634656539646337633264326438313739383962313330373833 -39386631613733613337313836396461346133393037623865333963626239643266356132653938 -66393033303037313530383032363864636335366163313432393631303361343465633261623135 -34643430303161613864376663356365666462323736323062336439656335346363653661336366 -373637333036653964393162356666316464 diff --git a/ansible/roles/nebula/files/certs/grimes.key b/ansible/roles/nebula/files/certs/grimes.key deleted file mode 100644 index a8e5759..0000000 --- a/ansible/roles/nebula/files/certs/grimes.key +++ /dev/null @@ -1,11 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -33656633333362653332356534646138636331303235633335313663316631666665323762646630 -3230386135663030656363373531356139393231326561330a323762313261353939643630323535 -66633835343465376632373632646562366333393862303166636666313462343034396436316131 -6532613432663631640a363935346362303964343961323832653732393137643865646437393530 -35636436366465383235326431373539333537336533363932663062626366313764356264383865 -33323434363538646536626463666230373734313866393736666534323866616262303631356237 -34383431656137306132336566313837326438393232393964656265393837376238376365376538 -36356266346336656566393035653738356130646133663733666131333134643330633965336432 -36336537383230623861396162316633656432303130303935383437393931666466636464316264 -3236353733316437643335653835613732373235303830383334 diff --git a/terraform/grimes_vps.tf b/terraform/grimes_vps.tf deleted file mode 100644 index a2e5ca3..0000000 --- a/terraform/grimes_vps.tf +++ /dev/null @@ -1,38 +0,0 @@ -resource "linode_instance" "grimes" { - label = "grimes" - region = "eu-central" - type = "g6-nanode-1" - - private_ip = true - - config { - kernel = "linode/grub2" - label = "My Ubuntu 20.04 LTS Disk Profile" - - devices { - sda { - disk_label = "Ubuntu 20.04 LTS Disk" - } - - sdb { - disk_label = "512 MB Swap Image" - } - } - } - - disk { - filesystem = "ext4" - label = "Ubuntu 20.04 LTS Disk" - read_only = false - size = 25088 - } - disk { - filesystem = "swap" - label = "512 MB Swap Image" - read_only = false - size = 512 - } - - timeouts {} - -} diff --git a/terraform/providers.tf b/terraform/providers.tf index 111ecf4..523fdef 100644 --- a/terraform/providers.tf +++ b/terraform/providers.tf @@ -12,7 +12,3 @@ provider "cloudflare" { provider "aws" { region = "eu-west-2" } - -provider "linode" { - token = var.linode_api_token -} diff --git a/terraform/terraform.tf b/terraform/terraform.tf index c319a6d..ada7aba 100644 --- a/terraform/terraform.tf +++ b/terraform/terraform.tf @@ -12,9 +12,5 @@ terraform { source = "hashicorp/aws" version = "3.8.0" } - linode = { - source = "linode/linode" - version = "1.13.4" - } } } diff --git a/terraform/variables.tf b/terraform/variables.tf index adee3c2..4cc277f 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -1,4 +1,3 @@ variable "vultr_api_key" {} variable "cloudflare_api_key" {} variable "cloudflare_email" {} -variable "linode_api_token" {}