From 3103cd55f596198b0454b75e0f8202efa4dcda30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <joerg.sachse@slub-dresden.de>
Date: Tue, 17 Jan 2023 15:21:50 +0100
Subject: [PATCH] feat: add required subdirectories for uploaded reports (and
 cleanup the code using a loop instead of individual tasks)

---
 tasks/configure_sftp_server.yml | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/tasks/configure_sftp_server.yml b/tasks/configure_sftp_server.yml
index a19983a..308301b 100644
--- a/tasks/configure_sftp_server.yml
+++ b/tasks/configure_sftp_server.yml
@@ -40,21 +40,22 @@
         - restart sshd
 
     - name: Mountpoints fuer SFTP konfigurieren (3/3)
-      block:
-        - name: Homeverzeichnis konfigurieren
-          ansible.builtin.file:
-            path: "/home/{{ vault_sftp_user }}/"
-            state: directory
-            owner: "root"
-            group: "root"
-            mode: "0755"
-        - name: Uploadverzeichnis konfigurieren
-          ansible.builtin.file:
-            path: "/home/{{ vault_sftp_user }}/reports/"
-            state: directory
-            owner: "{{ vault_sftp_user }}"
-            group: "{{ vault_sftp_user }}"
-            mode: "0770"
+      ansible.builtin.file:
+        path: "{{ item.p }}"
+        state: directory
+        owner: "{{ item.o | default(vault_sftp_user) }}"
+        group: "{{ item.g | default(vault_sftp_user) }}"
+        mode: "{{ item.m | default('0770') }}"
+      loop:
+        # Homeverzeichnis
+        - p: "/home/{{ vault_sftp_user }}/"
+          o: "root"
+          g: "root"
+          m: "0755"
+        # Uploadverzeichnis konfigurieren
+        - p: "/home/{{ vault_sftp_user }}/reports/"
+        - p: "/home/{{ vault_sftp_user }}/reports/driveusage/"
+        - p: "/home/{{ vault_sftp_user }}/reports/tapeusage/"
 
 - name: Konfiguration fuer Default-SFTP-Server einspielen
   ansible.builtin.blockinfile:
-- 
GitLab