From b77ab6366a3a8007e8a850f972a41328c68baf33 Mon Sep 17 00:00:00 2001
From: tolerryan <105945216+tolerryan@users.noreply.github.com>
Date: Mon, 30 Dec 2024 00:51:26 -0600
Subject: [PATCH] update restic script

---
 roles/ind/wikmd/cron.vars           | 13 +++----------
 roles/ind/zabbix/docker-compose.yml |  4 ++--
 roles/lib/setup-restic.yml          |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/roles/ind/wikmd/cron.vars b/roles/ind/wikmd/cron.vars
index 3074d2c..c59b8f8 100644
--- a/roles/ind/wikmd/cron.vars
+++ b/roles/ind/wikmd/cron.vars
@@ -1,20 +1,13 @@
 ---
 cronjob:
-  #- name: home  
-  #  job_name: "Daily /home/docker/ Backup"
-  #  job_minute: "0"
-  #  job_hour: "2"
-  #  job_day: "*"
-  #  user: "root"
-  #  job_command: "/home/restic/restic.sh --backup /home/docker/"
-    
+
   - name: appdata
     job_name: "Daily /data/  Backup"
     job_minute: "0"
     job_hour: "3"
     job_day: "*"
     user: "root"
-    job_command: "/home/docker/restic.sh --backup /data/ "
+    job_command: "/home/restic/restic.sh --backup /data/ "
   
   - name: weeklydb
     job_name: "Weekly /data/ verification"
@@ -22,4 +15,4 @@ cronjob:
     job_hour: "6"
     job_day: "1"
     user: "root"
-    job_command: "/home/docker/restic.sh --verify /data/"
\ No newline at end of file
+    job_command: "/home/restic/restic.sh --verify /data/"
\ No newline at end of file
diff --git a/roles/ind/zabbix/docker-compose.yml b/roles/ind/zabbix/docker-compose.yml
index c5efa43..f4fc96c 100644
--- a/roles/ind/zabbix/docker-compose.yml
+++ b/roles/ind/zabbix/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 # Zabbix server
   zabbix-server:
     container_name: zabbix-server
-    image: zabbix/zabbix-server-mysql:ubuntu-7.2.*
+    image: zabbix/zabbix-server-mysql:ubuntu-7.2-latest
     restart: always
     ports:
       - 10051:10051
@@ -53,7 +53,7 @@ services:
 # Zabbix web UI
   zabbix-web:
     container_name: zabbix-web
-    image: zabbix/zabbix-web-nginx-mysql:ubuntu-7.2.*
+    image: zabbix/zabbix-web-nginx-mysql:ubuntu-7.2-latest
     restart: always
     ports:
       - 8080:8080
diff --git a/roles/lib/setup-restic.yml b/roles/lib/setup-restic.yml
index a23c2de..1b52f7f 100644
--- a/roles/lib/setup-restic.yml
+++ b/roles/lib/setup-restic.yml
@@ -45,7 +45,7 @@
         dest: /home/restic/restic.sh
         content: |
           #!/bin/bash
-
+          cd /home/restic/
           # Check if a flag was passed
           if [[ "$#" -lt 2 ]]; then
               echo "Usage: $0 [--backup] [--forget] [--check] [--init] dirtobackup"