Skip to content

Commit 111c771

Browse files
committed
Fixes JEA installer not including REST-Api on first run
1 parent 508f841 commit 111c771

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

doc/100-General/10-Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
1717
* [#660](https://github.com/Icinga/icinga-powershell-framework/pull/660) Fixes `Update-Icinga` not updating to the latest available version for a component and specifying `-Version` is updating to the latest one instead of the given one instead
1818
* [#661](https://github.com/Icinga/icinga-powershell-framework/pull/661) Fixes Icinga Agent installation and uninstallation, which could cause unintended automatic reboots
1919
* [#662](https://github.com/Icinga/icinga-powershell-framework/pull/662) Fixes JEA-Profiles always being updated during `Update-Icinga` calls, even when no component or non JEA related components were updated
20+
* [#664](https://github.com/Icinga/icinga-powershell-framework/pull/664) Fixes JEA profile compiler not including REST-Api configuration during first installation
2021

2122
## 1.11.0 (2023-08-01)
2223

lib/core/installer/Start-IcingaForWindowsInstallation.psm1

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -252,22 +252,6 @@ function Start-IcingaForWindowsInstallation()
252252
Restart-IcingaWindowsService;
253253
}
254254

255-
switch ($InstallJEAProfile) {
256-
'0' {
257-
Install-IcingaJEAProfile;
258-
$InstallJEA = $TRUE;
259-
break;
260-
};
261-
'1' {
262-
Install-IcingaSecurity;
263-
$InstallJEA = $TRUE;
264-
break;
265-
};
266-
'2' {
267-
# Do not install JEA profile
268-
};
269-
}
270-
271255
switch ($InstallApiChecks) {
272256
'0' {
273257
Disable-IcingaFrameworkApiChecks;
@@ -298,9 +282,26 @@ function Start-IcingaForWindowsInstallation()
298282
};
299283
}
300284

285+
switch ($InstallJEAProfile) {
286+
'0' {
287+
Install-IcingaJEAProfile;
288+
$InstallJEA = $TRUE;
289+
break;
290+
};
291+
'1' {
292+
Install-IcingaSecurity;
293+
$InstallJEA = $TRUE;
294+
break;
295+
};
296+
'2' {
297+
# Do not install JEA profile
298+
};
299+
}
300+
301301
# Install Icinga for Windows certificate if both, JEA and REST is installed
302302
if ($InstallJEA -And $InstallRESTApi) {
303303
Install-IcingaForWindowsCertificate;
304+
Restart-IcingaWindowsService;
304305
}
305306

306307
# Update configuration and clear swap

0 commit comments

Comments
 (0)