From 0cfd052a6e3e41769dc27a2825ff2488027e39b0 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Thu, 24 Aug 2023 11:53:08 -0700
Subject: [PATCH] Move backup module to a module under root

---
 backups.tf                                    |  3 +++
 backups/.terraform.lock.hcl                   | 21 +++++++++++++++++++
 {services/backups => backups}/backup.nomad    |  9 ++++----
 {services/backups => backups}/backups.tf      |  0
 .../backups => backups}/jobs/authelia.hcl     |  0
 .../backups => backups}/jobs/grafana.hcl      |  0
 {services/backups => backups}/jobs/lidarr.hcl |  0
 {services/backups => backups}/jobs/lldap.hcl  |  0
 {services/backups => backups}/jobs/nzbget.hcl |  0
 .../backups => backups}/jobs/photoprism.hcl   |  0
 .../backups => backups}/jobs/sabnzbd.hcl      |  0
 {services/backups => backups}/jobs/sonarr.hcl |  1 -
 services/backups/.terraform.lock.hcl          | 21 -------------------
 13 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 backups.tf
 create mode 100644 backups/.terraform.lock.hcl
 rename {services/backups => backups}/backup.nomad (96%)
 rename {services/backups => backups}/backups.tf (100%)
 rename {services/backups => backups}/jobs/authelia.hcl (100%)
 rename {services/backups => backups}/jobs/grafana.hcl (100%)
 rename {services/backups => backups}/jobs/lidarr.hcl (100%)
 rename {services/backups => backups}/jobs/lldap.hcl (100%)
 rename {services/backups => backups}/jobs/nzbget.hcl (100%)
 rename {services/backups => backups}/jobs/photoprism.hcl (100%)
 rename {services/backups => backups}/jobs/sabnzbd.hcl (100%)
 rename {services/backups => backups}/jobs/sonarr.hcl (94%)
 delete mode 100644 services/backups/.terraform.lock.hcl

diff --git a/backups.tf b/backups.tf
new file mode 100644
index 0000000..16883e2
--- /dev/null
+++ b/backups.tf
@@ -0,0 +1,3 @@
+module "backups" {
+  source = "./backups"
+}
diff --git a/backups/.terraform.lock.hcl b/backups/.terraform.lock.hcl
new file mode 100644
index 0000000..ea59364
--- /dev/null
+++ b/backups/.terraform.lock.hcl
@@ -0,0 +1,21 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/nomad" {
+  version = "1.4.20"
+  hashes = [
+    "h1:M/QVXHPfeySejJZI3I8mBYrL/J9VsbnyF/dKIMlUhXo=",
+    "zh:02989edcebe724fc0aa873b22176fd20074c4f46295e728010711a8fc5dfa72c",
+    "zh:089ba7d19bcf5c6bab3f8b8c5920eb6d78c52cf79bb0c5dfeb411c600e7efcba",
+    "zh:235865a2182ca372bcbf440201a8b8cc0715ad5dbc4de893d99b6f32b5be53ab",
+    "zh:67ea718764f3f344ecc6e027d20c1327b86353c8064aa90da3ec12cec4a88954",
+    "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
+    "zh:8c68c540f0df4980568bdd688c2adec86eda62eb2de154e3db215b16de0a7ae0",
+    "zh:911969c63a69a733be57b96d54c5966c9424e1abec8d5f20038c8cef3a504c65",
+    "zh:a673c92ddc9d47e8d53dcb9b376f1adcb4543488202fc83a3e7eab8677530684",
+    "zh:a94a73eae89fd8c8ebf872013079be41161d3f293f4026c92d45c4c5667dd613",
+    "zh:db6b89f8b696040c0344f00928e4cf6e0a75034421ba14cdcd8a4d23bc865dce",
+    "zh:e512c0b1239e3d66b60d22c2b4de19fea288e492cde90dff9277cc475fd9dbbf",
+    "zh:ef6eccecbdef3bb8ce629cabfb5550c1db5c3e952943dda1786ef6cb470a8c23",
+  ]
+}
diff --git a/services/backups/backup.nomad b/backups/backup.nomad
similarity index 96%
rename from services/backups/backup.nomad
rename to backups/backup.nomad
index eddbfd8..eb8f7c5 100644
--- a/services/backups/backup.nomad
+++ b/backups/backup.nomad
@@ -112,13 +112,14 @@ RCLONE_FTP_NO_CHECK_CERTIFICATE=true
         data = <<EOF
 # Current node is {{ env "node.unique.name" }} {{ env "node.unique.id" }}
 
-%{~ for job_file in fileset(module_path, "jobs/*.hcl") }
-{{ range nomadService "${trimsuffix(basename(job_file), ".hcl")}" -}}
+%{ for job_file in fileset(module_path, "jobs/*.hcl") ~}
+{{ range nomadService 1 "backups" "${trimsuffix(basename(job_file), ".hcl")}" -}}
 # ${trimsuffix(basename(job_file), ".hcl")} .Node {{ .Node }}
 {{ if eq .Node (env "node.unique.id") -}}
 ${file("${module_path}/${job_file}")}
-{{- end }}
-{{- end }}
+
+{{ end -}}
+{{ end -}}
 %{ endfor ~}
         EOF
         destination = "local/node-jobs.hcl"
diff --git a/services/backups/backups.tf b/backups/backups.tf
similarity index 100%
rename from services/backups/backups.tf
rename to backups/backups.tf
diff --git a/services/backups/jobs/authelia.hcl b/backups/jobs/authelia.hcl
similarity index 100%
rename from services/backups/jobs/authelia.hcl
rename to backups/jobs/authelia.hcl
diff --git a/services/backups/jobs/grafana.hcl b/backups/jobs/grafana.hcl
similarity index 100%
rename from services/backups/jobs/grafana.hcl
rename to backups/jobs/grafana.hcl
diff --git a/services/backups/jobs/lidarr.hcl b/backups/jobs/lidarr.hcl
similarity index 100%
rename from services/backups/jobs/lidarr.hcl
rename to backups/jobs/lidarr.hcl
diff --git a/services/backups/jobs/lldap.hcl b/backups/jobs/lldap.hcl
similarity index 100%
rename from services/backups/jobs/lldap.hcl
rename to backups/jobs/lldap.hcl
diff --git a/services/backups/jobs/nzbget.hcl b/backups/jobs/nzbget.hcl
similarity index 100%
rename from services/backups/jobs/nzbget.hcl
rename to backups/jobs/nzbget.hcl
diff --git a/services/backups/jobs/photoprism.hcl b/backups/jobs/photoprism.hcl
similarity index 100%
rename from services/backups/jobs/photoprism.hcl
rename to backups/jobs/photoprism.hcl
diff --git a/services/backups/jobs/sabnzbd.hcl b/backups/jobs/sabnzbd.hcl
similarity index 100%
rename from services/backups/jobs/sabnzbd.hcl
rename to backups/jobs/sabnzbd.hcl
diff --git a/services/backups/jobs/sonarr.hcl b/backups/jobs/sonarr.hcl
similarity index 94%
rename from services/backups/jobs/sonarr.hcl
rename to backups/jobs/sonarr.hcl
index 67e99ba..a08da53 100644
--- a/services/backups/jobs/sonarr.hcl
+++ b/backups/jobs/sonarr.hcl
@@ -21,7 +21,6 @@ job "sonarr" {
   }
 
   backup {
-    # Not dunping sqlite because sonarr makes dumps
     paths = ["/data/sonarr"]
 
     backup_opts {
diff --git a/services/backups/.terraform.lock.hcl b/services/backups/.terraform.lock.hcl
deleted file mode 100644
index 70d1fae..0000000
--- a/services/backups/.terraform.lock.hcl
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is maintained automatically by "terraform init".
-# Manual edits may be lost in future updates.
-
-provider "registry.terraform.io/hashicorp/nomad" {
-  version = "1.4.16"
-  hashes = [
-    "h1:PQxNPNmMVOErxryTWIJwr22k95DTSODmgRylqjc2TjI=",
-    "h1:tyfjD/maKzb0RxxD9KWgLnkJu9lnYziYsQgGw85Giz8=",
-    "zh:0d4fbb7030d9caac3b123e60afa44f50c83cc2a983e1866aec7f30414abe7b0e",
-    "zh:0db080228e07c72d6d8ca8c45249d6f97cd0189fce82a77abbdcd49a52e57572",
-    "zh:0df88393271078533a217654b96f0672c60eb59570d72e6aefcb839eea87a7a0",
-    "zh:2883b335bb6044b0db6a00e602d6926c047c7f330294a73a90d089f98b24d084",
-    "zh:390158d928009a041b3a182bdd82376b50530805ae92be2b84ed7c3b0fa902a0",
-    "zh:7169b8f8df4b8e9659c49043848fd5f7f8473d0471f67815e8b04980f827f5ef",
-    "zh:9417ee1383b1edd137024882d7035be4dca51fb4f725ca00ed87729086ec1755",
-    "zh:a22910b5a29eeab5610350700b4899267c1b09b66cf21f7e4d06afc61d425800",
-    "zh:a6185c9cd7aa458cd81861058ba568b6411fbac344373a20155e20256f4a7557",
-    "zh:b6260ca9f034df1b47905b4e2a9c33b67dbf77224a694d5b10fb09ae92ffad4c",
-    "zh:d87c12a6a7768f2b6c2a59495c7dc00f9ecc52b1b868331d4c284f791e278a1e",
-  ]
-}