upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2025-12-21 07:10:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes missing Icinga Ticket dialogue

Browse source
This commit is contained in:
Lord Hepipud 2019-11-04 10:08:28 +01:00
parent 1f21de5de5
commit 817cff457d
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1
View file

@ -21,6 +21,7 @@ function Start-IcingaAgentInstallWizard()
[string]$CAEndpoint, [string]$CAEndpoint,
$CAPort = $null, $CAPort = $null,
[string]$Ticket, [string]$Ticket,
$EmptyTicket,
[string]$CAFile = $null, [string]$CAFile = $null,
$EmptyCA = $null, $EmptyCA = $null,
[switch]$RunInstaller, [switch]$RunInstaller,
@ -338,13 +339,26 @@ function Start-IcingaAgentInstallWizard()
$CAEndpoint = (Get-IcingaAgentInstallerAnswerInput -Prompt 'Please enter the IP/FQDN for either ONE of your Icinga parent nodes or your Icinga 2 CA master' -Default 'v' -DefaultInput (Get-IPConfigFromString $EndpointConnections[0]).address).answer; $CAEndpoint = (Get-IcingaAgentInstallerAnswerInput -Prompt 'Please enter the IP/FQDN for either ONE of your Icinga parent nodes or your Icinga 2 CA master' -Default 'v' -DefaultInput (Get-IPConfigFromString $EndpointConnections[0]).address).answer;
$InstallerArguments += "-CAEndpoint $CAEndpoint"; $InstallerArguments += "-CAEndpoint $CAEndpoint";
} }
if ($null -eq $Ticket) { if ([string]::IsNullOrEmpty($Ticket) -And $null -eq $EmptyTicket) {
if ((Get-IcingaAgentInstallerAnswerInput -Prompt 'Do you have a Icinga Ticket available to sign your certificate?' -Default 'y').result -eq 1) { if ((Get-IcingaAgentInstallerAnswerInput -Prompt 'Do you have a Icinga Ticket available to sign your certificate?' -Default 'y').result -eq 1) {
$Ticket = (Get-IcingaAgentInstallerAnswerInput -Prompt 'Please enter your Icinga Ticket' -Default 'v').answer; $Ticket = (Get-IcingaAgentInstallerAnswerInput -Prompt 'Please enter your Icinga Ticket' -Default 'v').answer;
$InstallerArguments += "-Ticket $Ticket"; if ([string]::IsNullOrEmpty($Ticket)) {
$InstallerArguments += "-EmptyTicket 1"
} else {
$InstallerArguments += "-EmptyTicket 0"
}
$InstallerArguments += "-Ticket '$Ticket'";
} else { } else {
$InstallerArguments += "-Ticket ''"; $InstallerArguments += "-Ticket ''";
$InstallerArguments += "-EmptyTicket 1"
} }
} else {
if ([string]::IsNullOrEmpty($Ticket)) {
$InstallerArguments += "-Ticket ''";
} else {
$InstallerArguments += "-Ticket '$Ticket";
}
$InstallerArguments += "-EmptyTicket $EmptyTicket"
} }
} else { } else {
if ([string]::IsNullOrEmpty($CAFile) -And $null -eq $EmptyCA) { if ([string]::IsNullOrEmpty($CAFile) -And $null -eq $EmptyCA) {