From 8e8dbc3e651020749eec858c182cd1bf171fc097 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Wed, 17 Jul 2024 20:08:38 -0700
Subject: [PATCH] Clean up of iot block lists

---
 core/blocky/blocky.nomad   | 32 ++++++++++++++++++++++++++++++--
 core/blocky/blocky.tf      |  1 +
 core/blocky/config.yml     | 10 ++++++----
 core/blocky/list-sonos.txt |  2 ++
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 core/blocky/list-sonos.txt

diff --git a/core/blocky/blocky.nomad b/core/blocky/blocky.nomad
index c15ad39..a967038 100644
--- a/core/blocky/blocky.nomad
+++ b/core/blocky/blocky.nomad
@@ -14,7 +14,6 @@ job "blocky" {
 
   update {
     max_parallel = 1
-    # TODO: maybe switch to service job from system so we can use canary and autorollback
     auto_revert = true
     min_healthy_time = "60s"
     healthy_deadline = "5m"
@@ -210,7 +209,36 @@ job "blocky" {
 {{- end }}
         EOF
         destination = "$${NOMAD_TASK_DIR}/wemo.txt"
-        change_mode = "noop"
+        change_mode = "script"
+
+        change_script {
+          command = "/app/blocky"
+          args = ["lists", "refresh"]
+          timeout = "20s"
+        }
+
+        wait {
+          min = "10s"
+          max = "20s"
+        }
+      }
+
+      template {
+        data = <<EOF
+{{ if nomadVarExists "blocky_lists/terraform" }}
+{{ with nomadVar "blocky_lists/terraform" -}}
+{{ .sonos.Value }}
+{{- end }}
+{{- end }}
+        EOF
+        destination = "$${NOMAD_TASK_DIR}/sonos.txt"
+        change_mode = "script"
+
+        change_script {
+          command = "/app/blocky"
+          args = ["lists", "refresh"]
+          timeout = "20s"
+        }
 
         wait {
           min = "10s"
diff --git a/core/blocky/blocky.tf b/core/blocky/blocky.tf
index 206bd25..65062fc 100644
--- a/core/blocky/blocky.tf
+++ b/core/blocky/blocky.tf
@@ -72,6 +72,7 @@ resource "nomad_variable" "blocky_lists_terraform" {
   items = {
     smarttv_regex = file("${path.module}/list-smarttv-regex.txt")
     wemo          = file("${path.module}/list-wemo.txt")
+    sonos         = file("${path.module}/list-sonos.txt")
   }
 }
 
diff --git a/core/blocky/config.yml b/core/blocky/config.yml
index f1d3f7a..457d3da 100644
--- a/core/blocky/config.yml
+++ b/core/blocky/config.yml
@@ -78,11 +78,11 @@ blocking:
       - https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
       - https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
       # - https://hosts-file.net/ad_servers.txt
-    smarttv:
+    iot:
       - https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt
       - {{ env "NOMAD_TASK_DIR" }}/smarttv-regex.txt
-    wemo:
       - {{ env "NOMAD_TASK_DIR" }}/wemo.txt
+      - {{ env "NOMAD_TASK_DIR" }}/sonos.txt
     antisocial:
       - |
         facebook.com
@@ -101,8 +101,10 @@ blocking:
     default:
       - ads
       - custom
-      - smarttv
-      - wemo
+    192.168.3.1/24:
+      - ads
+      - iot
+      - custom
 
 customDNS:
   customTTL: 1h
diff --git a/core/blocky/list-sonos.txt b/core/blocky/list-sonos.txt
new file mode 100644
index 0000000..246325e
--- /dev/null
+++ b/core/blocky/list-sonos.txt
@@ -0,0 +1,2 @@
+# Block Sonos devices from phoning home and allowing remote access
+(^|\.)sonos\.com$