From f69f7b62091e769d10b53e7a80d980ec9e5ba38e Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Fri, 9 Sep 2022 16:00:28 +0100
Subject: [PATCH] use variable for homelab user

---
 group_vars/servers.yml                        |  6 ++--
 .../templates/docker-volume-backup.j2         | 21 -----------
 .../templates/docker-volume-backup/config.j2  | 36 -------------------
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 roles/setup_hosted_services/templates/docker-volume-backup.j2
 delete mode 100644 roles/setup_hosted_services/templates/docker-volume-backup/config.j2

diff --git a/group_vars/servers.yml b/group_vars/servers.yml
index 87c3b6e..771077e 100644
--- a/group_vars/servers.yml
+++ b/group_vars/servers.yml
@@ -3,15 +3,15 @@ backups:
     monthly: monthly
     nightly: nightly
 
-homelab_user: cianhatton
+homelab_user: &main_user cianhatton
 
 configure_mergerfs: false
 configure_samba: false
 samba_group: smbgroup
 samba_user: smbuser
 users:
-  - name: cianhatton
-    group: cianhatton
+  - name: *main_user
+    group: *main_user
     passwordless_sudo: true
 
 shares:
diff --git a/roles/setup_hosted_services/templates/docker-volume-backup.j2 b/roles/setup_hosted_services/templates/docker-volume-backup.j2
deleted file mode 100644
index 2a98e48..0000000
--- a/roles/setup_hosted_services/templates/docker-volume-backup.j2
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# https://app.idrivee2.com/region/IE/buckets/backups/object-storage
-version: "3"
-services:
-  docker-volume-backup:
-    container_name: docker-volume-backup
-    restart: always
-    image: {{dockervolumebackup.image}}:{{dockervolumebackup.tag}}
-    command: periodic-backups
-    environment:
-      AWS_ACCESS_KEY_ID: {{ docker_volume_backup.aws_access_key_id }}
-      AWS_SECRET_ACCESS_KEY: {{ docker_volume_backup.aws_secret_access_key }}
-      AWS_DEFAULT_REGION: {{ docker_volume_backup.aws_default_region }}
-      AWS_BUCKET: {{ docker_volume_backup.aws_bucket }}
-      AWS_ENDPOINT: {{ docker_volume_backup.aws_endpoint }}
-
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - {{directories.backups_dir}}:/backups
-      - /tmp:/tmp
-      - {{dockervolumebackup.config_directory}}/config.yml:{{dockervolumebackup.config_directory}}/config.yml
diff --git a/roles/setup_hosted_services/templates/docker-volume-backup/config.j2 b/roles/setup_hosted_services/templates/docker-volume-backup/config.j2
deleted file mode 100644
index b765c91..0000000
--- a/roles/setup_hosted_services/templates/docker-volume-backup/config.j2
+++ /dev/null
@@ -1,36 +0,0 @@
----
-periodic_backups:
-  - name: "Nightly Volume Backups"
-    schedule: "0 3 * * *"
-    schedule_key: {{ backups.schedule_keys.nightly }}
-    backups:
-      - name: "Nightly backup to local filesystem"
-        type: "filesystem"
-        filesystem_options:
-            host_path: {{ directories.backups_dir }}
-      - name: "Backup to iDrive E2"
-        type: "s3"
-        s3_options:
-            host_path: {{ directories.backups_dir }}
-            aws_access_key_id: {{ docker_volume_backup.aws_access_key_id }}
-            aws_secret_access_key: {{ docker_volume_backup.aws_secret_access_key }}
-            aws_default_region: {{ docker_volume_backup.aws_default_region }}
-            aws_bucket: {{ docker_volume_backup.aws_bucket }}
-            aws_endpoint: {{ docker_volume_backup.aws_endpoint }}
-  - name: "Monthly Volume Backups"
-    schedule: "0 0 1 * *"
-    schedule_key: {{ backups.schedule_keys.monthly }}
-    backups:
-      - name: "Monthly backup to local filesystem"
-        type: "filesystem"
-        filesystem_options:
-            host_path: {{ directories.backups_dir }}
-      - name: "Backup to iDrive E2"
-        type: "s3"
-        s3_options:
-            host_path: {{ directories.backups_dir }}
-            aws_access_key_id: {{ docker_volume_backup.aws_access_key_id }}
-            aws_secret_access_key: {{ docker_volume_backup.aws_secret_access_key }}
-            aws_default_region: {{ docker_volume_backup.aws_default_region }}
-            aws_bucket: {{ docker_volume_backup.aws_bucket }}
-            aws_endpoint: {{ docker_volume_backup.aws_endpoint }}