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

Merge branch 'master' of https://github.com/Icinga/icinga-powershell-framework

Browse source
This commit is contained in:
Lord Hepipud 2020-07-13 15:06:01 +02:00
commit f0b5dbd971
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/31-Changelog.md
View file

@ -11,6 +11,15 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
[Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/7?closed=1) [Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/7?closed=1)
## 1.1.2 (2020-07-01)
[Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/9?closed=1)
### Bugfixes
* [#74](https://github.com/Icinga/icinga-powershell-framework/issues/74) Disabling Agent features for last list item is not possible
* [#75](https://github.com/Icinga/icinga-powershell-framework/issues/75) 'notification' feature is not disabled during installation
## 1.1.1 (2020-06-18) ## 1.1.1 (2020-06-18)
[Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/8?closed=1) [Issue and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/8?closed=1)

6
lib/core/icingaagent/misc/Start-IcingaAgentInstallWizard.psm1
View file

@ -10,6 +10,7 @@ function Start-IcingaAgentInstallWizard()
$AddGlobalTemplates = $null, $AddGlobalTemplates = $null,
[string]$PackageSource, [string]$PackageSource,
[string]$AgentVersion, [string]$AgentVersion,
[string]$InstallDir,
$AllowVersionChanges, $AllowVersionChanges,
$UpdateAgent = $null, $UpdateAgent = $null,
$AddFirewallRule = $null, $AddFirewallRule = $null,
@ -79,6 +80,9 @@ function Start-IcingaAgentInstallWizard()
$Result = Set-IcingaWizardArgument -DirectorArgs $DirectorArgs -WizardArg 'AgentVersion' -Value $AgentVersion -InstallerArguments $InstallerArguments; $Result = Set-IcingaWizardArgument -DirectorArgs $DirectorArgs -WizardArg 'AgentVersion' -Value $AgentVersion -InstallerArguments $InstallerArguments;
$AgentVersion = $Result.Value; $AgentVersion = $Result.Value;
$InstallerArguments = $Result.Args; $InstallerArguments = $Result.Args;
$Result = Set-IcingaWizardArgument -DirectorArgs $DirectorArgs -WizardArg 'InstallDir' -Value $InstallDir -InstallerArguments $InstallerArguments;
$InstallDir = $Result.Value;
$InstallerArguments = $Result.Args;
$Result = Set-IcingaWizardArgument -DirectorArgs $DirectorArgs -WizardArg 'CAPort' -Value $CAPort -InstallerArguments $InstallerArguments; $Result = Set-IcingaWizardArgument -DirectorArgs $DirectorArgs -WizardArg 'CAPort' -Value $CAPort -InstallerArguments $InstallerArguments;
$CAPort = $Result.Value; $CAPort = $Result.Value;
$InstallerArguments = $Result.Args; $InstallerArguments = $Result.Args;
@ -540,7 +544,7 @@ function Start-IcingaAgentInstallWizard()
} }
if ($RunInstaller) { if ($RunInstaller) {
if ((Install-IcingaAgent -Version $AgentVersion -Source $PackageSource -AllowUpdates $AllowVersionChanges) -Or $Reconfigure) { if ((Install-IcingaAgent -Version $AgentVersion -Source $PackageSource -AllowUpdates $AllowVersionChanges -InstallDir $InstallDir) -Or $Reconfigure) {
Reset-IcingaAgentConfigFile; Reset-IcingaAgentConfigFile;
Move-IcingaAgentDefaultConfig; Move-IcingaAgentDefaultConfig;
Set-IcingaAgentNodeName -Hostname $Hostname; Set-IcingaAgentNodeName -Hostname $Hostname;