From 1b9e59078eaa56b1e3c0604a489996f31af420ac Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Fri, 23 Dec 2022 18:28:01 +0100
Subject: [PATCH] Fixup!

---
 roles/docker/defaults/main.yml            |  2 +-
 roles/docker/tasks/services/emby.yml      |  4 ++--
 roles/docker/tasks/services/nextcloud.yml |  2 +-
 roles/os_config/tasks/disks.yml           | 24 ++++++++++++++++-------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 775533f..37b128e 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -34,7 +34,7 @@ services:
   monerod:
     file: monerod.yml
     domain: "xmr.{{ base_domain }}"
-    version: alpine
+    version: latest
 
   wireguard:
     file: wireguard.yml
diff --git a/roles/docker/tasks/services/emby.yml b/roles/docker/tasks/services/emby.yml
index 3244983..2315bb2 100644
--- a/roles/docker/tasks/services/emby.yml
+++ b/roles/docker/tasks/services/emby.yml
@@ -19,8 +19,8 @@
     image: "emby/embyserver_arm64v8:{{ services.emby.version }}"
     restart_policy: unless-stopped
     env:
-      UID: 1000
-      GID: 1000
+      UID: '1000'
+      GID: '1000'
     volumes:
       - "{{ services.emby.volume }}/programdata:/config:rw"
       - "{{ services.emby.volume }}/tvshows:/mnt/share1:rw"
diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml
index 3aa7e46..a1efeec 100644
--- a/roles/docker/tasks/services/nextcloud.yml
+++ b/roles/docker/tasks/services/nextcloud.yml
@@ -52,7 +52,7 @@
         redis:
           image: "redis:{{ services.nextcloud.redis_version }}"
           restart: unless-stopped
-          command: "redis-server --requirepass={{ secrets.nextcloud.redis_pw }}"
+          command: "redis-server --requirepass {{ secrets.nextcloud.redis_pw }}"
           tmpfs:
             - /var/lib/redis
 
diff --git a/roles/os_config/tasks/disks.yml b/roles/os_config/tasks/disks.yml
index 40ad432..c4f6631 100644
--- a/roles/os_config/tasks/disks.yml
+++ b/roles/os_config/tasks/disks.yml
@@ -13,26 +13,36 @@
     - disk: "{{ secrets.ssd }}"
       name: "{{ ssd_name }}"
 
+- name: Get list of mounted devices
+  shell: mount
+  register: blk_list
+
+- name: Create var mounted_devices
+  set_fact:
+    mounted_devices: "{{ blk_list.stdout_lines }}"
+
 - name: Create filesystems if they do not exist
   filesystem:
-    dev: "/dev/mapper/{{ item }}"
+    dev: "{{ item }}"
     fstype: ext4
     state: present
+  when: mounted_devices | select('search', item) | list | length == 0
   loop:
-    - "{{ hdd_name }}"
-    - "{{ ssd_name }}"
+    - "/dev/mapper/{{ hdd_name }}"
+    - "/dev/mapper/{{ ssd_name }}"
 
 - name: Mount filesystems
   mount:
-    src: "/dev/disk/by-uuid/{{ item.uuid }}"
+    src: "{{ item.dev }}"
     path: "{{ item.path }}"
     fstype: ext4
-    fstab: /dev/null
+    fstab: /tmp/fstab.ansible
     state: mounted
+  when: mounted_devices | select('search', item.dev) | list | length == 0
   loop:
-    - uuid: "{{ secrets.hdd.uuid }}"
+    - dev: "/dev/mapper/{{ hdd_name }}"
       path: "{{ hdd_mount_point }}"
-    - uuid: "{{ secrets.ssd.uuid }}"
+    - dev: "/dev/mapper/{{ ssd_name }}"
       path: "{{ ssd_mount_point }}"
 
 - name: Check if swapfile is mounted