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

Fixes Director Self-Service ticket handling

Browse source
This commit is contained in:
Lord Hepipud 2021-08-17 17:05:12 +02:00
parent bb88e05bae
commit a13567fffc
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/31-Changelog.md
View file

@ -19,7 +19,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
* [#327](https://github.com/Icinga/icinga-powershell-framework/pull/327) Fixes possible exception on first import run for certain systems * [#327](https://github.com/Icinga/icinga-powershell-framework/pull/327) Fixes possible exception on first import run for certain systems
* [#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
* [#331](https://github.com/Icinga/icinga-powershell-framework/pull/331) Fixes Icinga Director Self-Service installation over 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
### Enhancements ### Enhancements

6
lib/core/installer/menu/installation/director/DirectorTemplate.psm1
View file

@ -83,6 +83,7 @@ function Resolve-IcingaForWindowsManagementConsoleInstallationDirectorTemplate()
$IcingaParentAddresses = New-Object PSCustomObject; $IcingaParentAddresses = New-Object PSCustomObject;
$ParentZone = ''; $ParentZone = '';
$MasterAddress = ''; $MasterAddress = '';
$Ticket = '';
if ($DirectorUrl.ToLower().Contains('https://') -Or $DirectorUrl.ToLower().Contains('http://')) { if ($DirectorUrl.ToLower().Contains('https://') -Or $DirectorUrl.ToLower().Contains('http://')) {
$MasterAddress = $DirectorUrl.Split('/')[2]; $MasterAddress = $DirectorUrl.Split('/')[2];
@ -115,6 +116,8 @@ function Resolve-IcingaForWindowsManagementConsoleInstallationDirectorTemplate()
if ($null -ne $DirectorConfig.parent_zone) { if ($null -ne $DirectorConfig.parent_zone) {
$ParentZone = $DirectorConfig.parent_zone; $ParentZone = $DirectorConfig.parent_zone;
} }
$Ticket = Get-IcingaDirectorSelfServiceTicket -DirectorUrl $DirectorUrl -ApiKey $SelfServiceKey;
} }
if ($DirectorConfig.fetch_agent_fqdn) { if ($DirectorConfig.fetch_agent_fqdn) {
@ -188,6 +191,9 @@ function Resolve-IcingaForWindowsManagementConsoleInstallationDirectorTemplate()
Show-IcingaForWindowsInstallationMenuEnterIcingaCAServer -Automated -Value $MasterAddress; Show-IcingaForWindowsInstallationMenuEnterIcingaCAServer -Automated -Value $MasterAddress;
Show-IcingaForWindowsInstallerMenuSelectCertificate -Automated -DefaultInput '1';
Show-IcingaForWindowsInstallerMenuEnterIcingaTicket -Automated -Value $Ticket;
Show-IcingaForWindowsManagementConsoleInstallationDirectorRegisterHost -Automated; Show-IcingaForWindowsManagementConsoleInstallationDirectorRegisterHost -Automated;
Enable-IcingaFrameworkConsoleOutput; Enable-IcingaFrameworkConsoleOutput;