From bc620987b7e862957320f75bd3bce2f1b38d7a4a Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Mon, 24 Jun 2024 13:53:34 -0700
Subject: [PATCH] Move from Gitea to Nomad Vars for custom block and allow

DNS doesn't route to internal addresses for git.thefij.rocks because
list lookups use bootstrap DNS servers, which don't know about it.
---
 core/blocky/blocky.nomad | 34 ++++++++++++++++++++++++++++++++++
 core/blocky/config.yml   |  8 ++------
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/core/blocky/blocky.nomad b/core/blocky/blocky.nomad
index c576927..d968b29 100644
--- a/core/blocky/blocky.nomad
+++ b/core/blocky/blocky.nomad
@@ -121,6 +121,40 @@ job "blocky" {
           max = "20s"
         }
       }
+
+      template {
+        data = <<EOF
+{{ if nomadVarExists "nomad/jobs/blocky" }}
+{{ with nomadVar "nomad/jobs/blocky" -}}
+{{ .block_list.Value }}
+{{- end }}
+{{- end }}
+        EOF
+        destination = "$${NOMAD_TASK_DIR}/block"
+        change_mode = "noop"
+
+        wait {
+          min = "10s"
+          max = "20s"
+        }
+      }
+
+      template {
+        data = <<EOF
+{{ if nomadVarExists "nomad/jobs/blocky" }}
+{{ with nomadVar "nomad/jobs/blocky" -}}
+{{ .allow_list.Value }}
+{{- end }}
+{{- end }}
+        EOF
+        destination = "$${NOMAD_TASK_DIR}/allow"
+        change_mode = "noop"
+
+        wait {
+          min = "10s"
+          max = "20s"
+        }
+      }
     }
 
     task "stunnel" {
diff --git a/core/blocky/config.yml b/core/blocky/config.yml
index 9460a9f..d194b36 100644
--- a/core/blocky/config.yml
+++ b/core/blocky/config.yml
@@ -96,15 +96,11 @@ blocking:
         twitter.com
         youtube.com
     custom:
-      - https://git.thefij.rocks/iamthefij/blocklists/raw/branch/main/block
+      - {{ env "NOMAD_TASK_DIR" }}/block
 
   whiteLists:
-    ads:
-{{ with nomadVar "nomad/jobs/blocky" -}}
-{{ .whitelists_ads.Value | indent 6 }}
-{{- end }}
     custom:
-      - https://git.thefij.rocks/iamthefij/blocklists/raw/branch/main/allow
+      - {{ env "NOMAD_TASK_DIR" }}/allow
 
   clientGroupsBlock:
     default: