From d44af34aaaea19216ff15fd3e93dc961ef3ec732 Mon Sep 17 00:00:00 2001
From: abrown38 <a.brown@epcc.ed.ac.uk>
Date: Fri, 24 May 2024 08:45:58 +0100
Subject: [PATCH] added everyone and prepare to move share creation to new file

---
 ansible/roles/win_fileserver/tasks/disks.yml |  4 ++--
 ansible/roles/win_fileserver/tasks/main.yml  |  2 +-
 ansible/roles/win_fileserver/tasks/share.yml | 21 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/win_fileserver/tasks/disks.yml b/ansible/roles/win_fileserver/tasks/disks.yml
index 8abc477..0deed17 100644
--- a/ansible/roles/win_fileserver/tasks/disks.yml
+++ b/ansible/roles/win_fileserver/tasks/disks.yml
@@ -25,7 +25,7 @@
         description: "{{ studydata_volume_label }} Drive"
         path: "{{ studydata_drive_letter }}:\\"
         list: no
-        full: Administrators,Administrator,Everyone # is everyone needed
+        full: Administrators,Administrator,Everyone
       tags: studydata_share
 
 - name: File transfer disk
@@ -54,7 +54,7 @@
         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
 
     - name: Create EIDF directory in system drive for File Transfer script if it doesn't exist
diff --git a/ansible/roles/win_fileserver/tasks/main.yml b/ansible/roles/win_fileserver/tasks/main.yml
index 1bda549..e93e37f 100644
--- a/ansible/roles/win_fileserver/tasks/main.yml
+++ b/ansible/roles/win_fileserver/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - import_tasks: disks.yml
-- import_tasks: share.yml
+#- import_tasks: share.yml
 
diff --git a/ansible/roles/win_fileserver/tasks/share.yml b/ansible/roles/win_fileserver/tasks/share.yml
index e69de29..4bf9e37 100644
--- a/ansible/roles/win_fileserver/tasks/share.yml
+++ b/ansible/roles/win_fileserver/tasks/share.yml
@@ -0,0 +1,21 @@
+---
+- name: Create Shares
+  tags: create_shares
+  block:
+    - 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 File Transfer share"
+      win_share:
+        name: "{{ filetransfer_volume_label }}"
+        description: "File Transfer Script shared drive"
+        path: "{{ filetransfer_drive_letter }}:\\"
+        list: no
+        full: Administrators,Administrator,file-transfer
+      tags: filetransfer_share
\ No newline at end of file