From f77cd1216fe4d78a4d390d296529f4cf813f47ad Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Fri, 24 Jul 2020 17:14:39 +0100 Subject: [PATCH] Move upload server to `walker` --- ansible/main.yml | 2 +- ansible/roles/upload/files/docker-compose.yml | 8 ++++---- terraform/theorangeone.net.tf | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible/main.yml b/ansible/main.yml index 114dbda..c356e79 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -43,9 +43,9 @@ roles: - website - socks-proxy - - upload - hosts: walker roles: - contessa - statping + - upload diff --git a/ansible/roles/upload/files/docker-compose.yml b/ansible/roles/upload/files/docker-compose.yml index 0c08573..d22de2c 100644 --- a/ansible/roles/upload/files/docker-compose.yml +++ b/ansible/roles/upload/files/docker-compose.yml @@ -5,7 +5,7 @@ services: image: minio/minio:latest restart: unless-stopped volumes: - - ./data:/data + - /mnt/tank/upload:/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: - - ./data/img:/srv:ro + - /mnt/tank/upload/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: - - ./data/background:/srv:ro + - /mnt/tank/upload/background:/srv:ro environment: - FANCY_INDEX=on labels: @@ -41,7 +41,7 @@ services: image: theorangeone/static-server:latest restart: unless-stopped volumes: - - ./data/download:/srv:ro + - /mnt/tank/upload/download:/srv:ro labels: - traefik.enable=true - traefik.http.routers.dl.rule=Host(`dl.theorangeone.net`) || Host(`dl.0rng.one`) diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf index 9b55d2a..a511535 100644 --- a/terraform/theorangeone.net.tf +++ b/terraform/theorangeone.net.tf @@ -120,7 +120,7 @@ resource "cloudflare_record" "theorangeonenet_srv_matrix" { resource "cloudflare_record" "theorangeonenet_img" { zone_id = cloudflare_zone.theorangeonenet.id name = "img" - value = vultr_server.grimes.main_ip + value = var.walker_ip type = "A" ttl = 1 } @@ -128,7 +128,7 @@ resource "cloudflare_record" "theorangeonenet_img" { resource "cloudflare_record" "theorangeonenet_dl" { zone_id = cloudflare_zone.theorangeonenet.id name = "dl" - value = vultr_server.grimes.main_ip + value = var.walker_ip type = "A" ttl = 1 } @@ -136,7 +136,7 @@ resource "cloudflare_record" "theorangeonenet_dl" { resource "cloudflare_record" "theorangeonenet_bg" { zone_id = cloudflare_zone.theorangeonenet.id name = "bg" - value = vultr_server.grimes.main_ip + value = var.walker_ip type = "A" ttl = 1 } @@ -144,7 +144,7 @@ resource "cloudflare_record" "theorangeonenet_bg" { resource "cloudflare_record" "theorangeonenet_upload" { zone_id = cloudflare_zone.theorangeonenet.id name = "upload" - value = vultr_server.grimes.main_ip + value = var.walker_ip type = "A" ttl = 1 }