mirror of
https://github.com/Icinga/icinga-powershell-framework.git
synced 2025-12-20 23:00:35 -05:00
Merge branch 'master' of https://github.com/LordHepipud/icinga-module-windows
This commit is contained in:
commit
d3d5d8d4bd
1 changed files with 7 additions and 3 deletions
|
|
@ -364,8 +364,12 @@ function Start-IcingaAgentInstallWizard()
|
||||||
if ([string]::IsNullOrEmpty($CAFile) -And $null -eq $EmptyCA) {
|
if ([string]::IsNullOrEmpty($CAFile) -And $null -eq $EmptyCA) {
|
||||||
if ((Get-IcingaAgentInstallerAnswerInput -Prompt 'Is your public Icinga 2 CA (ca.crt) available on a local, network or web share?' -Default 'y').result -eq 1) {
|
if ((Get-IcingaAgentInstallerAnswerInput -Prompt 'Is your public Icinga 2 CA (ca.crt) available on a local, network or web share?' -Default 'y').result -eq 1) {
|
||||||
$CAFile = (Get-IcingaAgentInstallerAnswerInput -Prompt 'Please provide the full path to your ca.crt file' -Default 'v').answer;
|
$CAFile = (Get-IcingaAgentInstallerAnswerInput -Prompt 'Please provide the full path to your ca.crt file' -Default 'v').answer;
|
||||||
$InstallerArguments += "-CAFile $CAFile";
|
if ([string]::IsNullOrEmpty($CAFile)) {
|
||||||
$InstallerArguments += "-EmptyCA 0";
|
$InstallerArguments += "-EmptyCA 1"
|
||||||
|
} else {
|
||||||
|
$InstallerArguments += "-EmptyCA 0"
|
||||||
|
}
|
||||||
|
$InstallerArguments += "-CAFile '$CAFile'";
|
||||||
} else {
|
} else {
|
||||||
$InstallerArguments += "-CAFile ''";
|
$InstallerArguments += "-CAFile ''";
|
||||||
$InstallerArguments += "-EmptyCA 1"
|
$InstallerArguments += "-EmptyCA 1"
|
||||||
|
|
@ -374,7 +378,7 @@ function Start-IcingaAgentInstallWizard()
|
||||||
if ([string]::IsNullOrEmpty($CAFile)) {
|
if ([string]::IsNullOrEmpty($CAFile)) {
|
||||||
$InstallerArguments += "-CAFile ''";
|
$InstallerArguments += "-CAFile ''";
|
||||||
} else {
|
} else {
|
||||||
$InstallerArguments += "-CAFile $CAFile";
|
$InstallerArguments += "-CAFile '$CAFile'";
|
||||||
}
|
}
|
||||||
$InstallerArguments += "-EmptyCA $EmptyCA"
|
$InstallerArguments += "-EmptyCA $EmptyCA"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue