From 89a6c7680c85f70e09f1c23fc3509b483f2d409f Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 28 Jan 2021 18:56:39 +0000 Subject: [PATCH] Decommission `walker` Kimsufi is just too annoying of a host. Everything has either been moved off, killed, or has further plans. --- ansible/group_vars/all/wireguard.yml | 18 ----------- ansible/hosts | 1 - ansible/main.yml | 16 +--------- .../roles/contessa/files/docker-compose.yml | 16 ---------- ansible/roles/contessa/handlers/main.yml | 4 --- ansible/roles/contessa/tasks/main.yml | 20 ------------ ansible/roles/contessa/vars/main.yml | 22 ------------- ansible/roles/deluge/files/docker-compose.yml | 31 ------------------- ansible/roles/deluge/handlers/main.yml | 4 --- ansible/roles/deluge/tasks/main.yml | 17 ---------- terraform/0rng.one.tf | 10 +----- terraform/jakehoward.tech.tf | 8 ----- terraform/theorangeone.net.tf | 8 ----- terraform/variables.tf | 4 --- 14 files changed, 2 insertions(+), 177 deletions(-) delete mode 100644 ansible/roles/contessa/files/docker-compose.yml delete mode 100644 ansible/roles/contessa/handlers/main.yml delete mode 100644 ansible/roles/contessa/tasks/main.yml delete mode 100644 ansible/roles/contessa/vars/main.yml delete mode 100644 ansible/roles/deluge/files/docker-compose.yml delete mode 100644 ansible/roles/deluge/handlers/main.yml delete mode 100644 ansible/roles/deluge/tasks/main.yml diff --git a/ansible/group_vars/all/wireguard.yml b/ansible/group_vars/all/wireguard.yml index b06e478..0a974e8 100644 --- a/ansible/group_vars/all/wireguard.yml +++ b/ansible/group_vars/all/wireguard.yml @@ -111,24 +111,6 @@ wireguard: 6533393634663939350a313237386565313737346664333334653932663935653338623465383631 34646432373131626465653632613235363730353531363136333339383130346535313536636265 3631316663306563366137656364313266366237646665303362 - walker: - ip: 10.23.0.4 - public_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 33663838353065316231356136346462383861636237313562366563363766623839376431323963 - 6533646261643731383635323164636635336538656335330a346239633137356237313433373661 - 61326664623566646163316563356363346333336431656165303131306533646235333038386464 - 3365396161393465300a353666373937633463646437343461653732636136626636306364383836 - 38353033316331616564623061396438353361663764333739623362306139663630613437623763 - 3132316262633264386332396333653666636334613064303063 - private_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 38663561326361643965323062373764333463383134633536613262323061353163373139616130 - 6534373965616233363963336231656266323162323935630a366565383962323234326364663761 - 64313834666636383338343837616337623035356164373939636433633632613432623766346534 - 6534636665396639660a656339653164666662393064356436336138396534643139623437343333 - 66366464363631623363616362326238336261396134383762643662353636393436303435343362 - 6431323863386632633035306434636338306166633966326239 grimes: ip: 10.23.0.3 public_key: !vault | diff --git a/ansible/hosts b/ansible/hosts index 751283a..6c9539f 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -1,5 +1,4 @@ casey -walker grimes pve diff --git a/ansible/main.yml b/ansible/main.yml index 0539721..778791f 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -15,7 +15,6 @@ - nebula - hosts: - - walker - grimes - pve-docker roles: @@ -29,13 +28,6 @@ - docker_cleanup - traefik -# ZFS Hosts -- hosts: - - walker - - pve - roles: - - zfs - - hosts: - grimes roles: @@ -53,13 +45,6 @@ - duplicati - yourls -- hosts: walker - roles: - - contessa - - duplicati - - gitlab_pages - - deluge - - hosts: ingress roles: - ingress @@ -69,3 +54,4 @@ - role: proxmox-nag-removal become: true - pve + - zfs diff --git a/ansible/roles/contessa/files/docker-compose.yml b/ansible/roles/contessa/files/docker-compose.yml deleted file mode 100644 index e0ed40d..0000000 --- a/ansible/roles/contessa/files/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "2.3" - -services: - contessa: - image: minio/minio:latest - restart: unless-stopped - volumes: - - /mnt/tank/contessa:/data - command: server /data --quiet - environment: - - MINIO_ACCESS_KEY={{ minio_access_key }} - - MINIO_SECRET_KEY={{ minio_secret_key }} - labels: - - traefik.enable=true - - traefik.http.routers.contessa.rule=Host(`contessa.jakehoward.tech`) - - traefik.http.routers.contessa.tls.certresolver=le diff --git a/ansible/roles/contessa/handlers/main.yml b/ansible/roles/contessa/handlers/main.yml deleted file mode 100644 index 8ede262..0000000 --- a/ansible/roles/contessa/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart contessa - shell: - chdir: /opt/contessa - cmd: "{{ docker_update_command }}" diff --git a/ansible/roles/contessa/tasks/main.yml b/ansible/roles/contessa/tasks/main.yml deleted file mode 100644 index 1bdb350..0000000 --- a/ansible/roles/contessa/tasks/main.yml +++ /dev/null @@ -1,20 +0,0 @@ -- name: Include variables - include_vars: main.yml - -- name: Create install directory - file: - path: /opt/contessa - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install compose file - template: - src: files/docker-compose.yml - dest: /opt/contessa/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config - notify: restart contessa - become: true diff --git a/ansible/roles/contessa/vars/main.yml b/ansible/roles/contessa/vars/main.yml deleted file mode 100644 index 225a4c4..0000000 --- a/ansible/roles/contessa/vars/main.yml +++ /dev/null @@ -1,22 +0,0 @@ -minio_access_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 37383434623164656163396634653735393265613566353131316461666136656433363066633332 - 6338626439363939316561353938383237623930323561660a353836636363633065396434313339 - 63653937636133653534313832303565643162333263373435316438303438393165326365326531 - 3162363432383261330a653163643939383137653030633736346533343536386166623030336361 - 61636366626235316138383236393061333130303138353066663563656331343437373764623961 - 37626666393736396166323439363066313936306464613837366161353739613430313632633036 - 61666566333432343161366163656538343063353531656265323535353836303536613562646335 - 36613735326130306666343038313237373935316666653733393936356131663333393232613331 - 36393430383239386631656663663162333134386537306562386435353964646366 -minio_secret_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 30663437356366323237336531303938653830303761383136613234393639663534656361393462 - 6230666430633230613436333363633364373464376261640a343035386437376539376637646331 - 39636635396330333731646231653838616336643764336465303130336461643265396634633261 - 3333373431653832380a613631353331323239373464653034626264353035313736356165656430 - 66376163653635373236383631383439383533343563393136636262343263393561356539646437 - 38626137643538646265376362383561396233663165373834633138376633353034616138656631 - 33333936653730383431323632383433303139333636666535343534373964336636386566353432 - 63393262643563316561373336313661326333626134666237366235303663366433646139313734 - 62663932396337343630613335656537373339343239636362616138623232353031 diff --git a/ansible/roles/deluge/files/docker-compose.yml b/ansible/roles/deluge/files/docker-compose.yml deleted file mode 100644 index 837738a..0000000 --- a/ansible/roles/deluge/files/docker-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: "2.3" - -services: - deluge: - image: linuxserver/deluge:latest - environment: - - PUID={{ docker_user.id }} - - PGID={{ docker_user.id }} - - TZ=Europe/London - volumes: - - "{{ app_data_dir }}/deluge:/config" - - /mnt/tank/downloads:/downloads - ports: - - "{{ wireguard.clients[ansible_fqdn].ip }}:8112:8112" - restart: unless-stopped - depends_on: - - tor-socks-proxy - - tor-socks-proxy: - image: peterdavehello/tor-socks-proxy:latest - restart: unless-stopped - - egress: - image: theorangeone/static-server:latest - restart: unless-stopped - environment: - - INDEX=on - volumes: - - /mnt/tank/downloads:/srv:ro - ports: - - "{{ wireguard.clients[ansible_fqdn].ip }}:8180:80" diff --git a/ansible/roles/deluge/handlers/main.yml b/ansible/roles/deluge/handlers/main.yml deleted file mode 100644 index 7bd8472..0000000 --- a/ansible/roles/deluge/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart deluge - shell: - chdir: /opt/deluge - cmd: "{{ docker_update_command }}" diff --git a/ansible/roles/deluge/tasks/main.yml b/ansible/roles/deluge/tasks/main.yml deleted file mode 100644 index 8b5c4e1..0000000 --- a/ansible/roles/deluge/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -- name: Create deluge directory - file: - path: /opt/deluge - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install deluge compose file - template: - src: files/docker-compose.yml - dest: /opt/deluge/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config - notify: restart deluge - become: true diff --git a/terraform/0rng.one.tf b/terraform/0rng.one.tf index 58510f7..fed4dca 100644 --- a/terraform/0rng.one.tf +++ b/terraform/0rng.one.tf @@ -21,15 +21,7 @@ resource "cloudflare_record" "orngone_who" { resource "cloudflare_record" "orngone_img" { zone_id = cloudflare_zone.orngone.id name = "img" - value = var.walker_ip - type = "A" - ttl = 1 -} - -resource "cloudflare_record" "orngone_dl" { - zone_id = cloudflare_zone.orngone.id - name = "dl" - value = var.walker_ip + value = linode_instance.grimes.ip_address type = "A" ttl = 1 } diff --git a/terraform/jakehoward.tech.tf b/terraform/jakehoward.tech.tf index 782ed0c..6658fcc 100644 --- a/terraform/jakehoward.tech.tf +++ b/terraform/jakehoward.tech.tf @@ -140,14 +140,6 @@ resource "cloudflare_record" "jakehowardtech_homeassistant" { ttl = 1 } -resource "cloudflare_record" "jakehowardtech_contessa" { - zone_id = cloudflare_zone.jakehowardtech.id - name = "contessa" - value = var.walker_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "jakehowardtech_grafana" { zone_id = cloudflare_zone.jakehowardtech.id name = "grafana" diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf index dfd1259..ed8113c 100644 --- a/terraform/theorangeone.net.tf +++ b/terraform/theorangeone.net.tf @@ -157,14 +157,6 @@ resource "cloudflare_record" "theorangeonenet_pages" { ttl = 1 } -resource "cloudflare_record" "theorangeonenet_gitlab_pages_wildcard" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "*.pages" - value = var.walker_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "theorangeonenet_notes" { zone_id = cloudflare_zone.theorangeonenet.id name = "notes" diff --git a/terraform/variables.tf b/terraform/variables.tf index 984cdf9..ac7bd92 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -1,7 +1,3 @@ variable "vultr_api_key" {} variable "cloudflare_api_key" {} variable "linode_api_token" {} - -variable "walker_ip" { - default = "5.39.79.153" -}