From c38ba8589a229c8568da45f6534127b20a9d55d9 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Mon, 27 Mar 2023 15:21:35 -0700
Subject: [PATCH] Clean blocky config for latest version

---
 core/blocky/config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/blocky/config.yml b/core/blocky/config.yml
index 8ccf46f..88b9057 100644
--- a/core/blocky/config.yml
+++ b/core/blocky/config.yml
@@ -1,7 +1,10 @@
+ports:
+  dns: 53
+  http: 4000
+
 bootstrapDns:
-  ips:
-    - 1.1.1.1
-    - 1.0.0.1
+  - upstream: 1.1.1.1
+  - upstream: 1.0.0.1
 
 upstream:
   default:
@@ -88,7 +91,7 @@ customDNS:
       {{- with index $services $i }}{{ .Address }},{{ end -}}
     {{- end -}}
       {{- with index . $last }}{{ .Address }}{{ end -}}
-{{- end }}
+    {{- end }}
     # Other mappings
 {{ with nomadVar "nomad/jobs/blocky" }}{{ .mappings.Value | indent 4 }}{{ end }}
 
@@ -114,6 +117,3 @@ queryLog:
     target: {{ .db_user }}:{{ .db_pass }}@tcp({{ $mysql_addr }})/{{ .db_name }}?charset=utf8mb4&parseTime=True&loc=Local
     logRetentionDays: 14
 {{ end -}}
-
-port: 53
-httpPort: 4000