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

Merge pull request #335 from Icinga:fix/director_selfservice_zone_config

Browse source 
Fix: Icinga Director Self-Service Zones and CA config

Fixes an issue on legacy installation wizard, which did not render the zones.conf properly with the correct information shipped for connection data and added missing `-CAEndpoint` assignment, which was wrong previously.
This commit is contained in:
Lord Hepipud 2021-08-17 23:00:02 +02:00 committed by GitHub
commit 1f2f21d8e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/31-Changelog.md
View file

@ -20,6 +20,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#328](https://github.com/Icinga/icinga-powershell-framework/pull/328) Fixes installer while using installation files or the installation command, which did not overwrite default values with custom values * [#328](https://github.com/Icinga/icinga-powershell-framework/pull/328) Fixes installer while using installation files or the installation command, which did not overwrite default values with custom values
* [#330](https://github.com/Icinga/icinga-powershell-framework/pull/330) Fixes `Remove-ItemSecure` which was not using all args and might fail on empty path entries * [#330](https://github.com/Icinga/icinga-powershell-framework/pull/330) Fixes `Remove-ItemSecure` which was not using all args and might fail on empty path entries
* [#332](https://github.com/Icinga/icinga-powershell-framework/pull/332) Fixes Icinga Director Self-Service ticket handling, which was not working within the Icinga Management Console * [#332](https://github.com/Icinga/icinga-powershell-framework/pull/332) Fixes Icinga Director Self-Service ticket handling, which was not working within the Icinga Management Console
* [#335](https://github.com/Icinga/icinga-powershell-framework/pull/335) Fixex Icinga Director Self-Service Zones and CA config for legacy installation wizard
### Enhancements ### Enhancements

11
lib/core/icingaagent/misc/Convert-IcingaDirectorSelfServiceArguments.psm1
View file

@ -5,7 +5,7 @@ function Convert-IcingaDirectorSelfServiceArguments()
); );
if ($null -eq $JsonInput) { if ($null -eq $JsonInput) {
return @{}; return @{ };
} }
[hashtable]$DirectorArguments = @{ [hashtable]$DirectorArguments = @{
@ -15,7 +15,7 @@ function Convert-IcingaDirectorSelfServiceArguments()
AllowVersionChanges = $JsonInput.allow_updates; AllowVersionChanges = $JsonInput.allow_updates;
GlobalZones = $JsonInput.global_zones; GlobalZones = $JsonInput.global_zones;
ParentZone = $JsonInput.parent_zone; ParentZone = $JsonInput.parent_zone;
#CAEndpoint = $JsonInput.ca_server; CAEndpoint = $JsonInput.IcingaMaster;
Endpoints = $JsonInput.parent_endpoints; Endpoints = $JsonInput.parent_endpoints;
AddFirewallRule = $JsonInput.agent_add_firewall_rule; AddFirewallRule = $JsonInput.agent_add_firewall_rule;
AcceptConnections = $JsonInput.agent_add_firewall_rule; AcceptConnections = $JsonInput.agent_add_firewall_rule;
@ -61,8 +61,8 @@ function Convert-IcingaDirectorSelfServiceArguments()
} }
$NetworkDefault = ''; $NetworkDefault = '';
foreach ($Endpoint in $JsonInput.parent_endpoints) { foreach ($Endpoint in $JsonInput.endpoints_config) {
$NetworkDefault += [string]::Format('[{0}]:{1},', $Endpoint, $JsonInput.agent_listen_port); $NetworkDefault += [string]::Format('[{0}]:{1},', ($Endpoint.Split(';')[0]), $JsonInput.agent_listen_port);
} }
if ([string]::IsNullOrEmpty($NetworkDefault) -eq $FALSE) { if ([string]::IsNullOrEmpty($NetworkDefault) -eq $FALSE) {
$NetworkDefault = $NetworkDefault.Substring(0, $NetworkDefault.Length - 1).Split(','); $NetworkDefault = $NetworkDefault.Substring(0, $NetworkDefault.Length - 1).Split(',');
@ -71,9 +71,6 @@ function Convert-IcingaDirectorSelfServiceArguments()
); );
$EndpointConnections = $NetworkDefault; $EndpointConnections = $NetworkDefault;
$DirectorArguments.Add(
'CAEndpoint', (Get-IPConfigFromString $EndpointConnections[0]).address
);
} }
return $DirectorArguments; return $DirectorArguments;