Move upload to grimes

ansible/main.yml

@@ -42,6 +42,7 @@
     - plausible
     - duplicati
     - pages
+    - upload
 
 - hosts: pve-docker
   roles:
@@ -55,7 +56,6 @@
 - hosts: walker
   roles:
     - contessa
-    - upload
     - duplicati
     - gitlab_pages
     - deluge

ansible/roles/upload/files/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: minio/minio:latest
     restart: unless-stopped
     volumes:
-      - /mnt/tank/upload:/data
+      - ./files:/data
     command: server /data --quiet
     environment:
       - MINIO_ACCESS_KEY={{ minio_access_key }}
@@ -19,7 +19,7 @@ services:
     image: theorangeone/static-server:latest
     restart: unless-stopped
     volumes:
-      - /mnt/tank/upload/img:/srv:ro
+      - ./files/img:/srv:ro
     labels:
       - traefik.enable=true
       - traefik.http.routers.img.rule=Host(`img.theorangeone.net`) || Host(`img.0rng.one`)
@@ -29,7 +29,7 @@ services:
     image: theorangeone/static-server:latest
     restart: unless-stopped
     volumes:
-      - /mnt/tank/upload/background:/srv:ro
+      - ./files/background:/srv:ro
     environment:
       - FANCY_INDEX=on
     labels:
@@ -41,7 +41,7 @@ services:
     image: theorangeone/static-server:latest
     restart: unless-stopped
     volumes:
-      - /mnt/tank/upload/download:/srv:ro
+      - ./files/download:/srv:ro
     labels:
       - traefik.enable=true
       - traefik.http.routers.dl.rule=Host(`dl.theorangeone.net`) || Host(`dl.0rng.one`)

terraform/theorangeone.net.tf

@@ -104,7 +104,7 @@ resource "cloudflare_record" "theorangeonenet_srv_matrix" {
 resource "cloudflare_record" "theorangeonenet_img" {
   zone_id = cloudflare_zone.theorangeonenet.id
   name    = "img"
-  value   = var.walker_ip
+  value   = linode_instance.grimes.ip_address
   type    = "A"
   ttl     = 1
 }
@@ -112,7 +112,7 @@ resource "cloudflare_record" "theorangeonenet_img" {
 resource "cloudflare_record" "theorangeonenet_dl" {
   zone_id = cloudflare_zone.theorangeonenet.id
   name    = "dl"
-  value   = var.walker_ip
+  value   = linode_instance.grimes.ip_address
   type    = "A"
   ttl     = 1
 }
@@ -120,7 +120,7 @@ resource "cloudflare_record" "theorangeonenet_dl" {
 resource "cloudflare_record" "theorangeonenet_bg" {
   zone_id = cloudflare_zone.theorangeonenet.id
   name    = "bg"
-  value   = var.walker_ip
+  value   = linode_instance.grimes.ip_address
   type    = "A"
   ttl     = 1
 }
@@ -128,7 +128,7 @@ resource "cloudflare_record" "theorangeonenet_bg" {
 resource "cloudflare_record" "theorangeonenet_upload" {
   zone_id = cloudflare_zone.theorangeonenet.id
   name    = "upload"
-  value   = var.walker_ip
+  value   = linode_instance.grimes.ip_address
   type    = "A"
   ttl     = 1
 }