upstream/icinga-powershell-framework
1
0
Fork 0
mirror of https://github.com/Icinga/icinga-powershell-framework.git synced 2026-02-03 04:09:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes Icinga CA port handling on installation

Browse source
This commit is contained in:
Lord Hepipud 2024-03-06 09:21:33 +01:00
parent 5d7824ba5c
commit 0f0980db4f
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/100-General/10-Changelog.md
View file

@ -16,6 +16,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#683](https://github.com/Icinga/icinga-powershell-framework/pull/683) Fixes JEA installer to exclude domain from user name length check, which can easily exceed the Windows 20 digits username limit
* [#685](https://github.com/Icinga/icinga-powershell-framework/pull/685) Fixes an issue while trying to stop the JEA process in certain cases, which results in an error during installation but has no other effect on the environment
* [#686](https://github.com/Icinga/icinga-powershell-framework/pull/686) Fixes certutil error handling and message output in case the icingaforwindows.pfx could not be created
* [#687](https://github.com/Icinga/icinga-powershell-framework/pull/687) Fixes Icinga for Windows port handling on installation, which will now use the proper defined port for communicating with the Icinga CA
### Enhancements

9
lib/core/icingaagent/installer/Install-IcingaAgentCertificates.psm1
View file

@ -93,6 +93,15 @@ function Install-IcingaAgentCertificates()
}
if (-Not [string]::IsNullOrEmpty($Endpoint)) {
# In case we use a custom configuration for our CA endpoint server with address and port, ensure we establish
# a connection to this endpoint as well as the port
$ConnectionConfig = Get-IPConfigFromString -IPConfig $Endpoint;
$Endpoint = $ConnectionConfig.address;
if ([string]::IsNullOrEmpty($ConnectionConfig.port) -eq $FALSE) {
$Port = $ConnectionConfig.port;
}
if (-Not (Test-IcingaAgentCertificates -CertDirectory $CertificateDirectory -Hostname $Hostname -TestTrustedParent -Force $Force)) {
Write-IcingaConsoleNotice ([string]::Format('Fetching trusted master certificate from "{0}"', $Endpoint));

13
lib/core/installer/Start-IcingaForWindowsInstallation.psm1
View file

@ -199,7 +199,18 @@ function Start-IcingaForWindowsInstallation()
Install-IcingaAgentBaseFeatures;
Write-IcingaAgentApiConfig -Port $IcingaPort;
if ((Install-IcingaAgentCertificates -Hostname $Hostname -Endpoint $IcingaCAServer -Port $IcingaPort -CACert $CertificateCAFile -Ticket $CertificateTicket -Force:$ForceCertificateGen) -eq $FALSE) {
# Fixes an issue with the local Icinga for Windows listen port and the defined ports for communicating with the Icinga Parent/CA Nodes
# This will check if we provided a custom port for the endpoints and use this one instead of the configured listen port if Icinga for Windows
$IcingaCAPort = $IcingaPort;
if ($null -ne $IcingaParentAddresses -And $IcingaParentAddresses.Count -ne 0) {
$ConnectionConfig = Get-IPConfigFromString -IPConfig ($IcingaParentAddresses[0]);
if ($null -ne $ConnectionConfig -And $null -ne $ConnectionConfig.Port -And [string]::IsNullOrEmpty($ConnectionConfig.Port) -eq $FALSE) {
$IcingaCAPort = $ConnectionConfig.Port;
}
}
if ((Install-IcingaAgentCertificates -Hostname $Hostname -Endpoint $IcingaCAServer -Port $IcingaCAPort -CACert $CertificateCAFile -Ticket $CertificateTicket -Force:$ForceCertificateGen) -eq $FALSE) {
Disable-IcingaAgentFeature 'api';
Write-IcingaConsoleWarning `
-Message '{0}{1}{2}{3}{4}' `