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 Sync-IcingaRepository not saving SSH settings

Browse source
This commit is contained in:
LordHepipud 2023-07-25 00:35:20 +02:00
parent eb87a5aff5
commit 0b2fa0d256
2 changed files with 8 additions and 3 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
* [#579](https://github.com/Icinga/icinga-powershell-framework/issues/579) Fixes error message during config generation with `Get-IcingaCheckCommandConfig` to make it more clear, in case the custom variables generated are too long for the Icinga Director import
* [#603](https://github.com/Icinga/icinga-powershell-framework/issues/603) Fixes service filter to handle exclude with wildcards instead of requiring the full service name (*not* applying to the display name)
* [#609](https://github.com/Icinga/icinga-powershell-framework/issues/609) Fixes config generator to never use `set_if = true` on Icinga 2/Icinga Director configuration
* [#611](https://github.com/Icinga/icinga-powershell-framework/issues/611) Fixes `Sync-IcingaRepository` which did not save the SSH user and host inside the repository configuration, preventing `Update-IcingaRepository` to work properly and added missing scp progress
* [#615](https://github.com/Icinga/icinga-powershell-framework/issues/615) Fixes the framework migration tasks which fails in case multiple versions of the framework are installed, printing warnings in case there is
* [#617](https://github.com/Icinga/icinga-powershell-framework/issues/617) Fixes failing calls for plugins which use a switch argument like `-NoPerfData`, which is followed directly by the `-ThresholdInterval` argument
* [#621](https://github.com/Icinga/icinga-powershell-framework/pull/621) Fixes `-ThresholdInterval` key detection on newer systems

10
lib/core/repository/Sync-IcingaRepository.psm1
View file

@ -247,13 +247,17 @@ function Sync-IcingaRepository()
Write-IcingaConsoleNotice 'Syncing new repository files to "{0}"' -Objects $Path;
$Result = Start-IcingaProcess -Executable 'scp' -Arguments ([string]::Format('-r "{0}" "{1}:{2}"', $CopySource, $SSHAuth, $Path));
$SSHRemotePath = ([string]::Format('{0}:{1}', $SSHAuth, $Path));
if ($Result.ExitCode -ne 0) {
Write-IcingaConsoleError 'SCP Error while copying repository files: {0}' -Objects $Result.Error;
& scp -r "$CopySource" "$SSHRemotePath";
if ($LASTEXITCODE -ne 0) {
Write-IcingaConsoleError 'SCP Error while copying repository files';
$Success = Remove-Item -Path $TmpDir -Recurse -Force;
return;
}
$Path = $SSHRemotePath;
}
$Success = Remove-Item -Path $TmpDir -Recurse -Force;