From ebc93e6e038055d7b177ed4c160a74ec2b9ac217 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 02:00:49 +0000
Subject: [PATCH] chore: backup infrastructure configurations [skip ci]

---
 consul_backup/metadata.json                   |   2 +-
 .../nomad/postgres/members/pg-odroid6         |   2 +-
 .../nomad/postgres/members/pg-odroid7         |   2 +-
 .../nomad/postgres/members/pg-odroid8         |   2 +-
 consul_backup/nomad/postgres/members/pg-opti1 |   2 +-
 consul_backup/nomad/postgres/status           |   2 +-
 nomad_backup/garage-webui.hcl                 | 108 +++++++++++++
 nomad_backup/garage.hcl                       |  36 +----
 nomad_backup/garage_backup.hcl                | 147 ++++++++++++++++++
 9 files changed, 268 insertions(+), 35 deletions(-)
 create mode 100644 nomad_backup/garage-webui.hcl
 create mode 100644 nomad_backup/garage_backup.hcl

diff --git a/consul_backup/metadata.json b/consul_backup/metadata.json
index 8ba88cd..ea8bfc6 100644
--- a/consul_backup/metadata.json
+++ b/consul_backup/metadata.json
@@ -1,5 +1,5 @@
 {
-  "backup_timestamp": "2025-12-04T02:00:49.445063",
+  "backup_timestamp": "2025-12-05T02:00:49.057253",
   "total_keys": 79,
   "successful_backups": 74,
   "failed_backups": 5,
diff --git a/consul_backup/nomad/postgres/members/pg-odroid6 b/consul_backup/nomad/postgres/members/pg-odroid6
index b788503..96b9e27 100644
--- a/consul_backup/nomad/postgres/members/pg-odroid6
+++ b/consul_backup/nomad/postgres/members/pg-odroid6
@@ -1 +1 @@
-{"conn_url":"postgres://192.168.4.226:5432/postgres","api_url":"http://192.168.4.226:8008/patroni","state":"running","role":"replica","version":"4.0.4","xlog_location":599829803936,"replication_state":"streaming","timeline":248}
\ No newline at end of file
+{"conn_url":"postgres://192.168.4.226:5432/postgres","api_url":"http://192.168.4.226:8008/patroni","state":"running","role":"replica","version":"4.0.4","xlog_location":600968407064,"replication_state":"streaming","timeline":248}
\ No newline at end of file
diff --git a/consul_backup/nomad/postgres/members/pg-odroid7 b/consul_backup/nomad/postgres/members/pg-odroid7
index 3be4658..685bbce 100644
--- a/consul_backup/nomad/postgres/members/pg-odroid7
+++ b/consul_backup/nomad/postgres/members/pg-odroid7
@@ -1 +1 @@
-{"conn_url":"postgres://192.168.4.227:5432/postgres","api_url":"http://192.168.4.227:8008/patroni","state":"running","role":"replica","version":"4.0.4","xlog_location":599841055992,"replication_state":"streaming","timeline":248}
\ No newline at end of file
+{"conn_url":"postgres://192.168.4.227:5432/postgres","api_url":"http://192.168.4.227:8008/patroni","state":"running","role":"replica","version":"4.0.4","xlog_location":600979325184,"replication_state":"streaming","timeline":248}
\ No newline at end of file
diff --git a/consul_backup/nomad/postgres/members/pg-odroid8 b/consul_backup/nomad/postgres/members/pg-odroid8
index 5c2c35b..b04f32f 100644
--- a/consul_backup/nomad/postgres/members/pg-odroid8
+++ b/consul_backup/nomad/postgres/members/pg-odroid8
@@ -1 +1 @@
-{"conn_url":"postgres://192.168.4.228:5432/postgres","api_url":"http://192.168.4.228:8008/patroni","state":"running","role":"primary","version":"4.0.4","xlog_location":599839997952,"timeline":248}
\ No newline at end of file
+{"conn_url":"postgres://192.168.4.228:5432/postgres","api_url":"http://192.168.4.228:8008/patroni","state":"running","role":"primary","version":"4.0.4","xlog_location":600979325184,"timeline":248}
\ No newline at end of file
diff --git a/consul_backup/nomad/postgres/members/pg-opti1 b/consul_backup/nomad/postgres/members/pg-opti1
index e179268..416e8e3 100644
--- a/consul_backup/nomad/postgres/members/pg-opti1
+++ b/consul_backup/nomad/postgres/members/pg-opti1
@@ -1 +1 @@
-{"conn_url":"postgres://192.168.4.36:5432/postgres","api_url":"http://192.168.4.36:8008/patroni","state":"running","role":"replica","version":"4.0.4","xlog_location":599829831680,"replication_state":"streaming","timeline":248}
\ No newline at end of file
+{"conn_url":"postgres://192.168.4.36:5432/postgres","api_url":"http://192.168.4.36:8008/patroni","state":"running","role":"replica","version":"4.0.4","xlog_location":600969755376,"replication_state":"streaming","timeline":248}
\ No newline at end of file
diff --git a/consul_backup/nomad/postgres/status b/consul_backup/nomad/postgres/status
index 8bf0549..a6c65e3 100644
--- a/consul_backup/nomad/postgres/status
+++ b/consul_backup/nomad/postgres/status
@@ -1 +1 @@
-{"optime":599839997952,"slots":{"pg_odroid6":599839997952,"pg_odroid7":599839997952,"pg_opti1":599839997952,"pg_odroid8":599839997952},"retain_slots":["pg_odroid6","pg_odroid7","pg_odroid8","pg_opti1"]}
\ No newline at end of file
+{"optime":600979325184,"slots":{"pg_odroid6":600979325184,"pg_odroid7":600979325184,"pg_opti1":600979325184,"pg_odroid8":600979325184},"retain_slots":["pg_odroid6","pg_odroid7","pg_odroid8","pg_opti1"]}
\ No newline at end of file
diff --git a/nomad_backup/garage-webui.hcl b/nomad_backup/garage-webui.hcl
new file mode 100644
index 0000000..e7900bb
--- /dev/null
+++ b/nomad_backup/garage-webui.hcl
@@ -0,0 +1,108 @@
+job "garage-webui" {
+  datacenters = ["dc1"]
+  type        = "service"
+  
+  group "webui" {
+    count = 1
+    
+    network {
+      port "webui" {
+        static = 3909
+      }
+    }
+    
+    task "webui" {
+      driver = "docker"
+      
+      config {
+        image = "khairul169/garage-webui:latest"
+        ports = ["webui"]
+        
+        volumes = [
+          "local/garage.toml:/etc/garage.toml:ro"
+        ]
+      }
+      
+      # Copy the garage.toml for read-only access
+      template {
+        data = <<EOF
+metadata_dir = "/var/lib/garage/meta"
+data_dir = "/var/lib/garage/data"
+db_engine = "lmdb"
+replication_factor = 3
+consistency_mode = "consistent"
+compression_level = 1
+rpc_bind_addr = "[::]:3901"
+rpc_secret = "{{ key "garage/rpc_secret" }}"
+
+[consul_discovery]
+consul_http_addr = "http://consul.service.dc1.consul:8500"
+service_name = "garage-admin"
+
+[s3_api]
+s3_region = "garage"
+api_bind_addr = "[::]:3900"
+root_domain = ".s3.garage.dc1.consul"
+
+[s3_web]
+bind_addr = "[::]:3903"
+root_domain = ".web.garage.dc1.consul"
+
+[k2v_api]
+api_bind_addr = "[::]:3902"
+
+[admin]
+api_bind_addr = "[::]:3904"
+admin_token = "{{ key "garage/admin_token" }}"
+metrics_token = "{{ key "garage/metrics_token" }}"
+EOF
+        destination = "local/garage.toml"
+        change_mode = "restart"
+      }
+      
+      # Environment variables - using Consul service discovery
+      env {
+        API_BASE_URL     = "http://garage-admin.service.dc1.consul:3904"
+        S3_ENDPOINT_URL  = "http://garage-s3.service.dc1.consul:3900"
+      }
+      
+      # Resources
+      resources {
+        cpu    = 200
+        memory = 128
+      }
+      
+      # Service registration
+      service {
+        name = "garage-webui"
+        port = "webui"
+        
+        tags = [
+          "webui",
+          "http",
+          "traefik.enable=true",
+          "traefik.http.routers.garage-webui.rule=Host(`garage.example.com`)"
+        ]
+        
+        check {
+          type     = "http"
+          path     = "/"
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+      
+      # Kill timeout
+      kill_timeout = "30s"
+    }
+  }
+  
+  # Update strategy
+  update {
+    max_parallel     = 1
+    health_check     = "checks"
+    min_healthy_time = "10s"
+    healthy_deadline = "3m"
+    auto_revert      = true
+  }
+}
diff --git a/nomad_backup/garage.hcl b/nomad_backup/garage.hcl
index 9d46775..a291ce7 100644
--- a/nomad_backup/garage.hcl
+++ b/nomad_backup/garage.hcl
@@ -1,7 +1,7 @@
 job "garage" {
   datacenters = ["dc1"]
   type        = "system"
-  
+
   group "garage" {
     # Network configuration for Garage
     network {
@@ -21,53 +21,43 @@ job "garage" {
         static = 3901
       }
     }
-
     task "garage" {
       driver = "docker"
-
       # Multi-architecture image selection
       config {
         image = "dxflrs/garage:v2.1.0"
         ports = ["s3_api", "k2v_api", "web_api", "admin", "rpc"]
-        
+
         volumes = [
          "/mnt/configs/garage_data:/var/lib/garage/data",
          "/mnt/configs/garage_meta:/var/lib/garage/meta",
          "local/garage.toml:/etc/garage.toml"
          ]
       }
-
       # Configuration template
       template {
         data = <<EOF
 metadata_dir = "/var/lib/garage/meta"
 data_dir = "/var/lib/garage/data"
 db_engine = "lmdb"
-
 replication_factor = 3
 consistency_mode = "consistent"
-
 compression_level = 1
 rpc_bind_addr = "[::]:3901"
 rpc_public_addr = "{{ env "NOMAD_IP_rpc" }}:{{ env "NOMAD_PORT_rpc" }}"
 rpc_secret = "{{ key "garage/rpc_secret" }}"
-
 [consul_discovery]
 consul_http_addr = "http://consul.service.dc1.consul:8500"
 service_name = "garage-admin"
-
 [s3_api]
 s3_region = "garage"
 api_bind_addr = "[::]:3900"
 root_domain = ".s3.garage.dc1.consul"
-
 [s3_web]
 bind_addr = "[::]:3903"
 root_domain = ".web.garage.dc1.consul"
-
 [k2v_api]
 api_bind_addr = "[::]:3902"
-
 [admin]
 api_bind_addr = "[::]:3904"
 admin_token = "{{ key "garage/admin_token" }}"
@@ -76,88 +66,76 @@ EOF
         destination = "local/garage.toml"
         change_mode = "restart"
       }
-
       # Environment variables
       env {
         RUST_LOG = "garage=info"
       }
-
       # Resources
       resources {
         cpu    = 500
         memory = 128
       }
-
       # Service registration
       service {
         name = "garage-s3"
         port = "s3_api"
-        
+
         tags = [
           "s3",
           "storage"
         ]
-
         check {
           type     = "tcp"
           interval = "10s"
           timeout  = "2s"
         }
       }
-
       service {
         name = "garage-admin"
         port = "admin"
-        
+
         tags = [
           "admin",
           "metrics"
         ]
-
         check {
           type     = "tcp"
           interval = "10s"
           timeout  = "2s"
         }
       }
-
       service {
         name = "garage-web"
         port = "web_api"
-        
+
         tags = [
           "web",
           "http"
         ]
-
         check {
           type     = "tcp"
           interval = "10s"
           timeout  = "2s"
         }
       }
-
       service {
         name = "garage-k2v"
         port = "k2v_api"
-        
+
         tags = [
           "k2v",
           "storage"
         ]
-
         check {
           type     = "tcp"
           interval = "10s"
           timeout  = "2s"
         }
       }
-
       # Kill timeout
       kill_timeout = "30s"
     }
   }
-
   # Update strategy for system jobs
   update {
     max_parallel     = 1
@@ -166,4 +144,4 @@ EOF
     healthy_deadline = "5m"
     auto_revert      = true
   }
-}
\ No newline at end of file
+}
diff --git a/nomad_backup/garage_backup.hcl b/nomad_backup/garage_backup.hcl
new file mode 100644
index 0000000..894262f
--- /dev/null
+++ b/nomad_backup/garage_backup.hcl
@@ -0,0 +1,147 @@
+job "garage_backup" {
+  datacenters = ["dc1"]
+  type        = "system"
+  node_pool = "backup"
+  group "garage" {
+    # Network configuration for Garage
+    network {
+      port "s3_api" {
+        static = 3900
+      }
+      port "k2v_api" {
+        static = 3902
+      }
+      port "web_api" {
+        static = 3903
+      }
+      port "admin" {
+        static = 3904
+      }
+      port "rpc" {
+        static = 3901
+      }
+    }
+    task "garage" {
+      driver = "docker"
+      # Multi-architecture image selection
+      config {
+        image = "dxflrs/garage:v2.1.0"
+        ports = ["s3_api", "k2v_api", "web_api", "admin", "rpc"]
+
+        volumes = [
+         "/mnt/Shares/configs/garage_data:/var/lib/garage/data",
+         "/mnt/Shares/configs/garage_meta:/var/lib/garage/meta",
+         "local/garage.toml:/etc/garage.toml"
+         ]
+      }
+      # Configuration template
+      template {
+        data = <<EOF
+metadata_dir = "/var/lib/garage/meta"
+data_dir = "/var/lib/garage/data"
+db_engine = "lmdb"
+replication_factor = 3
+consistency_mode = "consistent"
+compression_level = 1
+rpc_bind_addr = "[::]:3901"
+rpc_public_addr = "{{ env "NOMAD_IP_rpc" }}:{{ env "NOMAD_PORT_rpc" }}"
+rpc_secret = "{{ key "garage/rpc_secret" }}"
+[consul_discovery]
+consul_http_addr = "http://consul.service.dc1.consul:8500"
+service_name = "garage-admin"
+[s3_api]
+s3_region = "garage"
+api_bind_addr = "[::]:3900"
+root_domain = ".s3.garage.dc1.consul"
+[s3_web]
+bind_addr = "[::]:3903"
+root_domain = ".web.garage.dc1.consul"
+[k2v_api]
+api_bind_addr = "[::]:3902"
+[admin]
+api_bind_addr = "[::]:3904"
+admin_token = "{{ key "garage/admin_token" }}"
+metrics_token = "{{ key "garage/metrics_token" }}"
+EOF
+        destination = "local/garage.toml"
+        change_mode = "restart"
+      }
+      # Environment variables
+      env {
+        RUST_LOG = "garage=info"
+      }
+      # Resources
+      resources {
+        cpu    = 500
+        memory = 128
+      }
+      # Service registration
+      service {
+        name = "garage-s3"
+        port = "s3_api"
+
+        tags = [
+          "s3",
+          "storage"
+        ]
+        check {
+          type     = "tcp"
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+      service {
+        name = "garage-admin"
+        port = "admin"
+
+        tags = [
+          "admin",
+          "metrics"
+        ]
+        check {
+          type     = "tcp"
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+      service {
+        name = "garage-web"
+        port = "web_api"
+
+        tags = [
+          "web",
+          "http"
+        ]
+        check {
+          type     = "tcp"
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+      service {
+        name = "garage-k2v"
+        port = "k2v_api"
+
+        tags = [
+          "k2v",
+          "storage"
+        ]
+        check {
+          type     = "tcp"
+          interval = "10s"
+          timeout  = "2s"
+        }
+      }
+      # Kill timeout
+      kill_timeout = "30s"
+    }
+  }
+  # Update strategy for system jobs
+  update {
+    max_parallel     = 1
+    health_check     = "checks"
+    min_healthy_time = "10s"
+    healthy_deadline = "5m"
+    auto_revert      = true
+  }
+}