diff options
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/setup.ps1 | 6 | ||||
| -rw-r--r-- | windows/win_get_url.ps1 | 31 |
2 files changed, 16 insertions, 21 deletions
diff --git a/windows/setup.ps1 b/windows/setup.ps1 index 63e5597d..0d6dcf08 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -150,9 +150,13 @@ $winrm_cert_expiry = Get-ChildItem -Path Cert:\LocalMachine\My | where Thumbprin if ($winrm_cert_expiry) { - Set-Attr $result.ansible_facts "ansible_winrm_certificate_expires" $winrm_cert_expiry.NotAfter.ToString("yyyy-MM-dd HH:mm:ss") + # this fact was renamed from ansible_winrm_certificate_expires due to collision with ansible_winrm_X connection var pattern + Set-Attr $result.ansible_facts "ansible_win_rm_certificate_expires" $winrm_cert_expiry.NotAfter.ToString("yyyy-MM-dd HH:mm:ss") } +$PendingReboot = Get-PendingRebootStatus +Set-Attr $result.ansible_facts "ansible_reboot_pending" $PendingReboot + # See if Facter is on the System Path Try { $facter_exe = Get-Command facter -ErrorAction Stop diff --git a/windows/win_get_url.ps1 b/windows/win_get_url.ps1 index 1f0e6580..f24b8740 100644 --- a/windows/win_get_url.ps1 +++ b/windows/win_get_url.ps1 @@ -26,33 +26,24 @@ $result = New-Object psobject @{ changed = $false } -If ($params.url) { - $url = $params.url -} -Else { - Fail-Json $result "missing required argument: url" -} - -If ($params.dest) { - $dest = $params.dest -} -Else { - Fail-Json $result "missing required argument: dest" -} +$url = Get-AnsibleParam $params -name "url" -failifempty $true +$dest = Get-AnsibleParam $params -name "dest" -failifempty $true -$skip_certificate_validation = Get-Attr $params "skip_certificate_validation" $false | ConvertTo-Bool -$username = Get-Attr $params "username" -$password = Get-Attr $params "password" +$skip_certificate_validation = Get-AnsibleParam $params -name "skip_certificate_validation" -default $false +$skip_certificate_validation = $skip_certificate_validation | ConvertTo-Bool +$username = Get-AnsibleParam $params "username" +$password = Get-AnsibleParam $params "password" -$proxy_url = Get-Attr $params "proxy_url" -$proxy_username = Get-Attr $params "proxy_username" -$proxy_password = Get-Attr $params "proxy_password" +$proxy_url = Get-AnsibleParam $params "proxy_url" +$proxy_username = Get-AnsibleParam $params "proxy_username" +$proxy_password = Get-AnsibleParam $params "proxy_password" if($skip_certificate_validation){ [System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true} } -$force = Get-Attr -obj $params -name "force" "yes" | ConvertTo-Bool +$force = Get-AnsibleParam -obj $params -name "force" -default $true +$force = $force | ConvertTo-Bool Function Download-File($result, $url, $dest, $username, $password, $proxy_url, $proxy_username, $proxy_password) { $webClient = New-Object System.Net.WebClient |