cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed string empty defaults for certs. Added a few new helpful

Browse source 
comments.
This commit is contained in:
Noah Sparks 2017-12-19 11:52:13 -05:00
parent 48f5c2c153
commit 48f35faea8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/windows/win_iis_webbinding.ps1
View file

@ -15,8 +15,8 @@ $host_header = Get-AnsibleParam $params -name "host_header" -type str
$protocol = Get-AnsibleParam $params -name "protocol" -type str -default 'http' $protocol = Get-AnsibleParam $params -name "protocol" -type str -default 'http'
$port = Get-AnsibleParam $params -name "port" -default '80' $port = Get-AnsibleParam $params -name "port" -default '80'
$ip = Get-AnsibleParam $params -name "ip" -default '*' $ip = Get-AnsibleParam $params -name "ip" -default '*'
$certificateHash = Get-AnsibleParam $params -name "certificate_hash" -type str -default ([string]::Empty) $certificateHash = Get-AnsibleParam $params -name "certificate_hash" -type str
$certificateStoreName = Get-AnsibleParam $params -name "certificate_store_name" -type str -default ([string]::Empty) $certificateStoreName = Get-AnsibleParam $params -name "certificate_store_name" -type str #default value gets applied later in script
$sslFlags = Get-AnsibleParam $params -name "ssl_flags" -default '0' -ValidateSet '0','1','2','3' $sslFlags = Get-AnsibleParam $params -name "ssl_flags" -default '0' -ValidateSet '0','1','2','3'
$result = @{ $result = @{
@ -67,6 +67,8 @@ function Get-SingleWebBinding {
If (-not $bind_search_splat['hostheader']) If (-not $bind_search_splat['hostheader'])
{ {
Try { Try {
# need to apply filter otherwise it's possible to return multiple items.
# without a host header, there *should* only ever be one binding on an ip/port combination.
Get-WebBinding @bind_search_splat | Where-Object {$_.BindingInformation.Split(':')[-1] -eq [string]::Empty} Get-WebBinding @bind_search_splat | Where-Object {$_.BindingInformation.Split(':')[-1] -eq [string]::Empty}
} }
Catch { Catch {
@ -229,7 +231,7 @@ If ($certificateHash -and $state -eq 'present')
} }
# make sure binding info is valid for central cert store if sslflags -gt 1 # make sure binding info is valid for central cert store if sslflags -gt 1
If ($sslFlags -gt 1 -and ($certificateHash -ne [string]::Empty -or $certificateStoreName -ne [string]::Empty)) If ($sslFlags -gt 1 -and ($certificateHash -or $certificateStoreName))
{ {
Fail-Json -obj $result -message "You set sslFlags to $sslFlags. This indicates you wish to use the Central Certificate Store feature. Fail-Json -obj $result -message "You set sslFlags to $sslFlags. This indicates you wish to use the Central Certificate Store feature.
This cannot be used in combination with certficiate_hash and certificate_store_name. When using the Central Certificate Store feature, This cannot be used in combination with certficiate_hash and certificate_store_name. When using the Central Certificate Store feature,