From 9d4cd686481ec7ac27f09b955684b65a2dabd77b Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Mon, 25 Jul 2022 15:50:25 -0700
Subject: [PATCH] Add test consul backup

---
 nomad/backups/.terraform.lock.hcl |  1 +
 nomad/backups/backup.nomad        | 10 ++++++++++
 nomad/backups/backups.tf          |  1 +
 nomad/backups/jobs/consul.hcl     |  2 +-
 nomad/backups/oneoff.nomad        |  7 -------
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nomad/backups/.terraform.lock.hcl b/nomad/backups/.terraform.lock.hcl
index 4a078a2..70d1fae 100644
--- a/nomad/backups/.terraform.lock.hcl
+++ b/nomad/backups/.terraform.lock.hcl
@@ -4,6 +4,7 @@
 provider "registry.terraform.io/hashicorp/nomad" {
   version = "1.4.16"
   hashes = [
+    "h1:PQxNPNmMVOErxryTWIJwr22k95DTSODmgRylqjc2TjI=",
     "h1:tyfjD/maKzb0RxxD9KWgLnkJu9lnYziYsQgGw85Giz8=",
     "zh:0d4fbb7030d9caac3b123e60afa44f50c83cc2a983e1866aec7f30414abe7b0e",
     "zh:0db080228e07c72d6d8ca8c45249d6f97cd0189fce82a77abbdcd49a52e57572",
diff --git a/nomad/backups/backup.nomad b/nomad/backups/backup.nomad
index 09d5b68..35b6628 100644
--- a/nomad/backups/backup.nomad
+++ b/nomad/backups/backup.nomad
@@ -3,6 +3,11 @@ variable "nextcloud_backup" {
   description = "HCL config for Restic Scheduler jobs"
 }
 
+variable "consul_backup" {
+  type = string
+  description = "HCL config for Restic Scheduler jobs"
+}
+
 job "backup" {
   datacenters = ["dc1"]
   type = "system"
@@ -118,6 +123,11 @@ BACKUP_PASSPHRASE={{ .Data.data.backup_passphrase }}
         # Build jobs based on node
         data = <<EOF
 # Current node is {{ env "node.unique.name" }}
+# Consul backup below?
+{{ if eq (env "node.unique.name") "n2" -}}
+# Consul backup
+${var.consul_backup}
+{{ end -}}
 {{ range service "nextcloud" }}
 # Nextcloud .Node {{ .Node }}
 {{ if eq .Node (env "node.unique.name") }}
diff --git a/nomad/backups/backups.tf b/nomad/backups/backups.tf
index 7eda315..b8d83c4 100644
--- a/nomad/backups/backups.tf
+++ b/nomad/backups/backups.tf
@@ -7,6 +7,7 @@ resource "nomad_job" "backups" {
     enabled = true
     vars = {
       "nextcloud_backup" = "${local.nextcloud_backup}",
+      "consul_backup"    = file("${path.module}/jobs/consul.hcl"),
     }
   }
 
diff --git a/nomad/backups/jobs/consul.hcl b/nomad/backups/jobs/consul.hcl
index 3478848..0da894b 100644
--- a/nomad/backups/jobs/consul.hcl
+++ b/nomad/backups/jobs/consul.hcl
@@ -1,5 +1,5 @@
 job "Consul" {
-  schedule = "0 0 * * *"
+  schedule = "* * * * *"
 
   config {
     # TODO: Backup to a meaningful location, this is just for testing
diff --git a/nomad/backups/oneoff.nomad b/nomad/backups/oneoff.nomad
index c14c960..4ff7497 100644
--- a/nomad/backups/oneoff.nomad
+++ b/nomad/backups/oneoff.nomad
@@ -108,13 +108,6 @@ job "backup-oneoff" {
       env = {
         "MYSQL_HOST" = "${NOMAD_UPSTREAM_IP_mysql_server}"
         "MYSQL_PORT" = "${NOMAD_UPSTREAM_PORT_mysql_server}"
-        # TODO: Add user with access to all databases or variables for each user
-        "MYSQL_DATABASE" = "nextcloud"
-        "MYSQL_USER" = "nextcloud"
-        "MYSQL_PASSWORD" = "nextcloud"
-
-        # TODO: Something from vault
-        "BACKUP_PASSPHRASE" = "secretpass"
       }
 
       template {