From de054a75a569071eaa6e7e2644f10d3db8813925 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Fri, 23 Dec 2022 18:46:44 +0100
Subject: [PATCH] Change directory owner and some service names

---
 roles/docker/tasks/services/nextcloud.yml | 11 ++++++-----
 roles/docker/tasks/services/restic.yml    |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml
index a1efeec..e76333b 100644
--- a/roles/docker/tasks/services/nextcloud.yml
+++ b/roles/docker/tasks/services/nextcloud.yml
@@ -2,14 +2,15 @@
 ---
 - name: Create Nextcloud volume directories
   file:
-    name: "{{ services.nextcloud.volume }}/{{ dir }}"
-    owner: root
+    name: "{{ services.nextcloud.volume }}/{{ dir.name }}"
+    owner: "{{ dir.owner | default('root') }}"
     mode: u=rwx,g=rx,o=rx
     state: directory
   loop:
-    - apache2
-    - data
-    - db
+    - name: apache2
+    - name: data
+    - name: db
+      owner: '999'
   loop_control:
     loop_var: dir
 
diff --git a/roles/docker/tasks/services/restic.yml b/roles/docker/tasks/services/restic.yml
index 1300e21..ff6e5f5 100644
--- a/roles/docker/tasks/services/restic.yml
+++ b/roles/docker/tasks/services/restic.yml
@@ -8,7 +8,7 @@
       version: '3.8'
 
       services:
-        restic_backup:
+        backup:
           image: "mazzolino/restic:{{ services.restic.version }}"
           restart: unless-stopped
           environment:
@@ -34,7 +34,7 @@
             - "{{ services.nextcloud.volume }}:/mnt/volumes/nextcloud:ro"
             - "{{ services.emby.volume }}/programdata:/mnt/volumes/emby/programdata:ro"
 
-        restic_prune:
+        prune:
           image: "mazzolino/restic:{{ services.restic.version }}"
           restart: unless-stopped
           environment:
@@ -48,7 +48,7 @@
             B2_ACCOUNT_KEY: "{{ secrets.restic.b2.key }}"
             TZ: "{{ timezone }}"
 
-        restic_check:
+        check:
           image: "mazzolino/restic:{{ services.restic.version }}"
           restart: unless-stopped
           environment: