From 089ac5fac3e40e72caeb62769a91ee598c2efe0b Mon Sep 17 00:00:00 2001 From: abrown38 Date: Tue, 4 Jun 2024 14:51:39 +0100 Subject: [PATCH] Use variables for creating scheduled tasks --- .../roles/win_fileserver/tasks/scheduled_tasks.yml | 14 +++++++------- ansible/roles/win_fileserver/vars/main.yml | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ansible/roles/win_fileserver/tasks/scheduled_tasks.yml b/ansible/roles/win_fileserver/tasks/scheduled_tasks.yml index e9f6125..d711a65 100644 --- a/ansible/roles/win_fileserver/tasks/scheduled_tasks.yml +++ b/ansible/roles/win_fileserver/tasks/scheduled_tasks.yml @@ -5,7 +5,7 @@ - name: Copy transfer scripts to fileserver win_copy: src: "{{ item }}" - dest: c:\eidf\ + dest: "{{ script_folder }}" force: true loop: - "{{ import_script }}" @@ -22,10 +22,10 @@ username: "{{ win_project }}\\{{ filetransfer_user }}" password: "{{ transfer_user_password }}" logon_type: password - path: \Transfer + path: "{{ scheduled_task_path }}" actions: - - path: C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe - arguments: C:\eidf\scheduled_transfer_Export_v1.3.ps1 + - path: "{{ powershell_path }}" + arguments: "{{ script_folder }}\\{{ export_script }}" triggers: - type: registration repetition: @@ -38,10 +38,10 @@ username: "{{ win_project }}\\{{ filetransfer_user }}" password: "{{ transfer_user_password }}" logon_type: password - path: \Transfer + path: "{{ scheduled_task_path }}" actions: - - path: C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe - arguments: C:\eidf\scheduled_transfer_Import_v1.3.ps1 + - path: "{{ powershell_path }}" + arguments: "{{ script_folder }}\\{{ import_script }}" triggers: - type: registration repetition: diff --git a/ansible/roles/win_fileserver/vars/main.yml b/ansible/roles/win_fileserver/vars/main.yml index bd9bee0..d4522f6 100644 --- a/ansible/roles/win_fileserver/vars/main.yml +++ b/ansible/roles/win_fileserver/vars/main.yml @@ -3,6 +3,8 @@ studydata_volume_label: Study_Data_DFS filetransfer_drive_letter: T filetransfer_volume_label: File_Transfer +script_folder: C:\eidf powershell_path: C:\WINDOWS\System32\WindowsPowerShell\v1.0\powershell.exe import_script: scheduled_transfer_import.ps1 -export_script: scheduled_transfer_export.ps1 \ No newline at end of file +export_script: scheduled_transfer_export.ps1 +scheduled_task_path: \Transfer