WIP

Author: LordHepipud

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

@@ -18,18 +18,6 @@ function Get-IcingaAgentInstallation()
         }
     }
 
-    $IcingaService = Get-IcingaWindowsServiceStatus -Service 'icinga2';
-    $ServiceUser   = 'NT AUTHORITY\NetworkService';
-
-    if ($IcingaService.Present) {
-        $ServiceUser = (Get-IcingaWindowsInformation Win32_Service |
-            ForEach-Object {
-                if ($_.Name -Like 'icinga2') {
-                    return $_;
-                }
-        } | Select-Object StartName).StartName;
-    }
-
     if ($null -eq $IcingaData) {
         return @{
             'Installed'    = $FALSE;
@@ -38,7 +26,7 @@ function Get-IcingaAgentInstallation()
             'Architecture' = $architecture;
             'Uninstaller'  = '';
             'InstallDate'  = '';
-            'User'         = $ServiceUser;
+            'User'         = (Get-IcingaServiceUser);
         };
     }
 
@@ -49,6 +37,6 @@ function Get-IcingaAgentInstallation()
         'Architecture' = $architecture;
         'Uninstaller'  = $IcingaData.UninstallString.Replace("MsiExec.exe ", "");
         'InstallDate'  = $IcingaData.InstallDate;
-        'User'         = $ServiceUser;
+        'User'         = (Get-IcingaServiceUser);
     };
 }

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

@@ -8,7 +8,7 @@ function Get-IcingaServiceUser()
     if ($Services.Present -eq $FALSE) {
         $Services = Get-IcingaWindowsServiceStatus -Service 'icingapowershell';
         if ($Services.Present -eq $FALSE) {
-            return $null;
+            return 'NT Authority\NetworkService';
         }
     }