From 8e3fbcedb9e7d91bf9afde661e48fb49215f47c5 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Fri, 24 Mar 2023 23:34:23 -0700
Subject: [PATCH] Fix backup conditionals

---
 services/backups/backup.nomad | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/services/backups/backup.nomad b/services/backups/backup.nomad
index 4bb2377..d0f76ae 100644
--- a/services/backups/backup.nomad
+++ b/services/backups/backup.nomad
@@ -114,41 +114,39 @@ RCLONE_FTP_NO_CHECK_CERTIFICATE=true
       template {
         # Build jobs based on node
         data = <<EOF
-# Current node is {{ env "node.unique.name" }}
-
-{{ range nomadService "nextcloud" -}}
-# nextcloud .Node {{ .Node }}
-{{ if eq .NodeId (env "node.unique.id") -}}
-${file("${module_path}/jobs/nextcloud.hcl")}
-{{- end }}
-{{- end }}
+# Current node is {{ env "node.unique.name" }} {{ env "node.unique.id" }}
 
 {{ range nomadService "grafana" -}}
-{{ if eq .NodeId (env "node.unique.id") -}}
+# grafana .Node {{ .Node }}
+{{ if eq .Node (env "node.unique.id") -}}
 ${file("${module_path}/jobs/grafana.hcl")}
 {{- end }}
 {{- end }}
 
 {{ range nomadService "photoprism" -}}
-{{ if eq .NodeId (env "node.unique.id") -}}
+# photoprism .Node {{ .Node }}
+{{ if eq .Node (env "node.unique.id") -}}
 ${file("${module_path}/jobs/photoprism.hcl")}
 {{- end }}
 {{- end }}
 
-{{ range service "lldap" -}}
-{{ if eq .NodeId (env "node.unique.id") -}}
+{{ range nomadService "lldap" -}}
+# lldap .Node {{ .Node }}
+{{ if eq .Node (env "node.unique.id") -}}
 ${file("${module_path}/jobs/lldap.hcl")}
 {{- end }}
 {{- end }}
 
-{{ range service "sonarr" -}}
-{{ if eq .NodeId (env "node.unique.id") -}}
+{{ range nomadService "sonarr" -}}
+# sonarr .Node {{ .Node }}
+{{ if eq .Node (env "node.unique.id") -}}
 ${file("${module_path}/jobs/sonarr.hcl")}
 {{- end }}
 {{- end }}
 
-{{ range service "nzbget" -}}
-{{ if eq .NodeId (env "node.unique.id") -}}
+{{ range nomadService "nzbget" -}}
+# nzbget .Node {{ .Node }}
+{{ if eq .Node (env "node.unique.id") -}}
 ${file("${module_path}/jobs/nzbget.hcl")}
 {{- end }}
 {{- end }}