From 5863de84aa1c8332faeba1d8d210301c7e6abe5c Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Thu, 4 Jul 2024 01:10:04 +0200 Subject: [PATCH] fmt --- docker.tf | 35 +++++++++++++++-------------------- modules/vigil/inputs.tf | 8 ++++---- terraform.tf | 2 +- video-bucket.tf | 10 +++++----- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/docker.tf b/docker.tf index 84c692c..745ca18 100644 --- a/docker.tf +++ b/docker.tf @@ -1,33 +1,28 @@ -/*provider "ssh" { - server = { - host = "california.ti" - port = 22 - } - user = "techinc" - auth = { - private_key = { - content = file("~/.ssh/keys/exploding_bolts_2_rsa") - } - } -} -data "ssh_tunnel" "docker" { - connection_name = "docker_socket_tunnel_california" - remote = { - socket = "/var/run/docker.sock" - } -} -*/ - provider "docker" { host = "ssh://california.ti" + registry_auth { + address = "docker.io" + username = "matthewbaggett" + password = "dckr_pat_6ytcZqdfqRXzFYe5GUh79RfH1Hw" + } } provider "docker" { alias = "printi" host = "ssh://prin.ti" + registry_auth { + address = "docker.io" + username = "matthewbaggett" + password = "dckr_pat_6ytcZqdfqRXzFYe5GUh79RfH1Hw" + } } provider "docker" { alias = "unifi" host = "ssh://unifi.ti" + registry_auth { + address = "docker.io" + username = "matthewbaggett" + password = "dckr_pat_6ytcZqdfqRXzFYe5GUh79RfH1Hw" + } } diff --git a/modules/vigil/inputs.tf b/modules/vigil/inputs.tf index 08b9ef9..fe421f0 100644 --- a/modules/vigil/inputs.tf +++ b/modules/vigil/inputs.tf @@ -19,10 +19,10 @@ variable "docker_networks" { variable "monitored_services" { type = map(list(object({ - id = string - label = string - endpoints = list(string) - http_method = optional(string, null) + id = string + label = string + endpoints = list(string) + http_method = optional(string, null) http_status_healthy_below = optional(number, 400) http_status_healthy_above = optional(number, 200) }))) diff --git a/terraform.tf b/terraform.tf index e85cd98..152b23b 100644 --- a/terraform.tf +++ b/terraform.tf @@ -14,7 +14,7 @@ terraform { version = "~> 0.1.0" } scratch = { - source = "BrendanThompson/scratch" + source = "BrendanThompson/scratch" version = "0.4.0" } } diff --git a/video-bucket.tf b/video-bucket.tf index 89cee0a..90f4ec9 100644 --- a/video-bucket.tf +++ b/video-bucket.tf @@ -7,9 +7,9 @@ resource "docker_service" "video_bucket" { container_spec { image = "${data.docker_registry_image.video_bucket.name}@${data.docker_registry_image.video_bucket.sha256_digest}" configs { - config_id = docker_config.video_bucket_config.id + config_id = docker_config.video_bucket_config.id config_name = docker_config.video_bucket_config.name - file_name = "/app/.env" + file_name = "/app/.env" } } networks_advanced { @@ -22,8 +22,8 @@ resource "docker_service" "video_bucket" { } } } -locals{ - video_bucket_config = <