From 51703c064b517b51aef1fe3684f1a7f028d62862 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Tue, 11 Jun 2024 10:01:11 +0100
Subject: [PATCH] move share creation to it's own task

---
 ansible/roles/win_fileserver/tasks/disks.yml | 56 ++++++++++++--------
 ansible/roles/win_fileserver/tasks/main.yml  |  3 +-
 ansible/roles/win_fileserver/tasks/share.yml |  2 +-
 ansible/roles/win_fileserver/vars/main.yml   |  1 +
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/ansible/roles/win_fileserver/tasks/disks.yml b/ansible/roles/win_fileserver/tasks/disks.yml
index 99cf9e5..4ccea63 100644
--- a/ansible/roles/win_fileserver/tasks/disks.yml
+++ b/ansible/roles/win_fileserver/tasks/disks.yml
@@ -19,14 +19,40 @@
         file_system: NTFS
         new_label: "{{ studydata_volume_label }}"
 
-    - name: "Create study data share"
-      win_share:
-        name: "{{ studydata_volume_label }}"
-        description: "{{ studydata_volume_label }} Drive"
-        path: "{{ studydata_drive_letter }}:\\"
-        list: no
-        full: Administrators,Administrator,Everyone
-      tags: studydata_share
+    - name: Create Archive directory on study data drive
+      win_file:
+        path: "{{ archive_folder }}"
+        state: directory
+      tags: never
+
+    - name: Set permissions on archive folder
+      win_acl:
+        path: "{{ archive_folder }}"
+        user: "{{ win_project }}\\Administrator"
+        type: allow
+        rights: Read,Write,Modify
+        state: present
+      tags: never
+
+    - name: Set permissions on archive folder
+      win_acl:
+        path: "{{ archive_folder }}"
+        user: "{{ item }}"
+        type: allow
+        rights: ReadAndExecute,Synchronize
+        state: absent
+      loop: [Administrators, Users]
+      tags: never
+
+    - name: Set permissions on archive folder
+      win_acl:
+        path: "{{ archive_folder }}"
+        user: BUILTIN\Users
+        type: allow
+        rights: FullControl
+        state: absent
+      loop: [Administrators, Users]
+      tags: never
 
 - name: File transfer disk
   tags: filetransfer_disk
@@ -48,20 +74,6 @@
         file_system: NTFS
         new_label: "{{ filetransfer_volume_label }}"
 
-    - name: "Create File Transfer share"
-      win_share:
-        name: "{{ filetransfer_volume_label }}"
-        description: "File Transfer Script shared drive"
-        path: "{{ filetransfer_drive_letter }}:\\"
-        list: no
-        full: Administrator@{{ win_project }}.loc,file-transfer
-      tags: filetransfer_share
-
-    - name: Create EIDF directory in system drive for File Transfer script if it doesn't exist
-      win_file:
-        path: "C:\\eidf"
-        state: directory
-
     - name: Create Import and Export directories in T drive for File Transfer script
       win_file:
         path: "T:\\{{ item }}"
diff --git a/ansible/roles/win_fileserver/tasks/main.yml b/ansible/roles/win_fileserver/tasks/main.yml
index 14ce4b6..5776df0 100644
--- a/ansible/roles/win_fileserver/tasks/main.yml
+++ b/ansible/roles/win_fileserver/tasks/main.yml
@@ -1,5 +1,4 @@
 ---
 - import_tasks: disks.yml
+- import_tasks: share.yml
 - import_tasks: scheduled_tasks.yml
-#- import_tasks: share.yml
-
diff --git a/ansible/roles/win_fileserver/tasks/share.yml b/ansible/roles/win_fileserver/tasks/share.yml
index 4bf9e37..c1ac6ae 100644
--- a/ansible/roles/win_fileserver/tasks/share.yml
+++ b/ansible/roles/win_fileserver/tasks/share.yml
@@ -17,5 +17,5 @@
         description: "File Transfer Script shared drive"
         path: "{{ filetransfer_drive_letter }}:\\"
         list: no
-        full: Administrators,Administrator,file-transfer
+        full: Administrator@{{ win_project }}.loc,file-transfer
       tags: filetransfer_share
\ No newline at end of file
diff --git a/ansible/roles/win_fileserver/vars/main.yml b/ansible/roles/win_fileserver/vars/main.yml
index d4522f6..af1432b 100644
--- a/ansible/roles/win_fileserver/vars/main.yml
+++ b/ansible/roles/win_fileserver/vars/main.yml
@@ -1,5 +1,6 @@
 studydata_drive_letter: S
 studydata_volume_label: Study_Data_DFS
+archive_folder: "{{ studydata_drive_letter }}:\\Archive"
 filetransfer_drive_letter: T
 filetransfer_volume_label: File_Transfer