WIP

Author: LordHepipud

lib/core/framework/Install-IcingaForWindowsService.psm1

@@ -39,13 +39,13 @@ function Install-IcingaForWindowsService()
 
     $UpdateFile = [string]::Format('{0}.update', $Path);
 
-    $ServiceStatus = (Get-IcingaWindowsServiceStatus -Service 'icingapowershell').Status;
+    $ServiceStatus = Get-IcingaWindowsServiceStatus -Service 'icingapowershell';
 
     if ((Test-Path $UpdateFile)) {
 
         Write-IcingaConsoleNotice 'Updating Icinga PowerShell Service binary';
 
-        if ($ServiceStatus -eq 'Running') {
+        if ($ServiceStatus.Status -eq 'Running') {
             Write-IcingaConsoleNotice 'Stopping Icinga PowerShell service';
             Stop-IcingaWindowsService;
             Start-Sleep -Seconds 1;
@@ -68,7 +68,7 @@ function Install-IcingaForWindowsService()
         (Get-IcingaPowerShellModuleFile)
     );
 
-    if ($null -eq $ServiceStatus) {
+    if ($ServiceStatus.Present -eq $FALSE) {
         $ServiceCreation = Start-IcingaProcess -Executable 'sc.exe' -Arguments ([string]::Format('create icingapowershell binPath= "{0}" DisplayName= "Icinga PowerShell Service" start= auto', $Path));
 
         if ($ServiceCreation.ExitCode -ne 0) {

lib/core/framework/New-IcingaEnvironmentVariable.psm1

@@ -68,6 +68,8 @@ function New-IcingaEnvironmentVariable()
         $Global:Icinga.Protected.Add('RunAsDaemon', $FALSE);
         $Global:Icinga.Protected.Add('Minimal', $FALSE);
         $Global:Icinga.Protected.Add('ThreadName', '');
+        $Global:Icinga.Protected.Add('IcingaServiceUser', '');
+        $Global:Icinga.Protected.Add('IfWServiceUser', '');
         $Global:Icinga.Protected.Add('GarbageCollector', @{ });
     }
 }

lib/core/icingaagent/getters/Get-IcingaServiceUser.psm1

@@ -1,5 +1,9 @@
 function Get-IcingaServiceUser()
 {
+    if ([string]::IsNullOrEmpty($Global:Icinga.Protected.IcingaServiceUser) -eq $FALSE) {
+        return $Global:Icinga.Protected.IcingaServiceUser;
+    }
+
     $Services = Get-IcingaWindowsServiceStatus -Service 'icinga2';
     if ($Services.Present -eq $FALSE) {
         $Services = Get-IcingaWindowsServiceStatus -Service 'icingapowershell';
@@ -21,5 +25,7 @@ function Get-IcingaServiceUser()
         $ServiceUser = 'NT Authority\SYSTEM';
     }
 
+    $Global:Icinga.Protected.IcingaServiceUser = $ServiceUser;
+
     return $ServiceUser;
 }

lib/core/icingaagent/setters/Set-IcingaAgentServiceUser.psm1

@@ -40,6 +40,12 @@ function Set-IcingaServiceUser()
             Set-IcingaUserPermissions;
         }
 
+        if ($Service -eq 'icinga2') {
+            $Global:Icinga.Protected.IcingaServiceUser = $User;
+        } elseif ($Service -eq 'icingapowershell') {
+            $Global:Icinga.Protected.IfWServiceUser = $User;
+        }
+
         Write-IcingaConsoleNotice 'Service User "{0}" for service "{1}" successfully updated' -Objects $User, $Service;
         return $TRUE;
     } else {