From f17dec7b57d762b529fab7c2a411309963f5976d Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Mon, 27 Mar 2023 15:20:50 -0700
Subject: [PATCH] Add nomad services to nomad zone using hosts in blocky

---
 core/blocky/blocky.nomad | 17 +++++++++++++++++
 core/blocky/config.yml   |  7 +++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/core/blocky/blocky.nomad b/core/blocky/blocky.nomad
index b3b17d1..0410785 100644
--- a/core/blocky/blocky.nomad
+++ b/core/blocky/blocky.nomad
@@ -86,6 +86,23 @@ job "blocky" {
           max = "20s"
         }
       }
+
+      template {
+        data = <<EOF
+{{ range nomadServices }}
+{{ range nomadService 1 (env "NOMAD_ALLOC_ID") .Name -}}
+{{ .Address }} {{ .Name }}.nomad
+{{- end }}
+{{- end }}
+        EOF
+        destination = "${NOMAD_TASK_DIR}/nomad.hosts"
+        change_mode = "noop"
+
+        wait {
+          min = "10s"
+          max = "20s"
+        }
+      }
     }
 
     task "redis-stunnel" {
diff --git a/core/blocky/config.yml b/core/blocky/config.yml
index 710689d..f4b5d1d 100644
--- a/core/blocky/config.yml
+++ b/core/blocky/config.yml
@@ -25,8 +25,6 @@ upstream:
 conditional:
   fallbackUpstream: false
   mapping:
-    # TODO: Run a simple dns server that this can forward to where it's hosts are set by nomad-services
-    # consul: {{ env "attr.unique.network.ip-address" }}:8600
     home.arpa: 192.168.2.1
     in-addr.arpa: 192.168.2.1
     iot: 192.168.2.1
@@ -34,6 +32,11 @@ conditional:
     thefij: 192.168.2.1
     .: 192.168.2.1
 
+hostsFile:
+  filePath: {{ env "NOMAD_TASK_DIR" }}/nomad.hosts
+  hostsTTL: 30s
+  refreshPeriod: 30s
+
 clientLookup:
   upstream: 192.168.2.1