diff --git a/VEEAM-INSTTALL/Install-VeeamEnterprise.ps1 b/VEEAM-INSTTALL/Install-VeeamEnterprise.ps1 index fca5801..20c2686 100644 --- a/VEEAM-INSTTALL/Install-VeeamEnterprise.ps1 +++ b/VEEAM-INSTTALL/Install-VeeamEnterprise.ps1 @@ -197,33 +197,34 @@ function Test-AdministratorRights { function Get-InstallerConfiguration { - Import-VeeamConfiguration + Write-Host "" + Write-Host "Lade Veeam Konfiguration..." -ForegroundColor Yellow - $Config = + Import-VeeamConfiguration ` + -Path $Script:ConfigPath - Get-Configuration + $Config = Get-Configuration + + + if($null -eq $Config) + { + throw "Keine Konfiguration geladen." + } $Validation = - Test-VeeamConfiguration ` - -Configuration $Config - if(!$Validation.Valid) { - - throw ` - "Konfigurationsprüfung fehlgeschlagen." - + throw "Konfigurationsprüfung fehlgeschlagen." } - return $Config } @@ -524,34 +525,56 @@ function Start-VeeamEnterpriseInstall { $Configuration = Get-InstallerConfiguration - if($Script:DryRun) - { - - Write-Host "" - - Write-Host "DRY-RUN aktiviert" -ForegroundColor Yellow - - $Simulation = Invoke-DryRunPipeline -Configuration $Configuration - - return ( - - Get-DryRunReport -Results $Simulation - - ) - - } - - - $SystemCheck = Test-InstallerPrerequisites $SQLCheck = Test-InstallerSQL -Configuration $Configuration - $Installation = Install-VeeamProduct -Configuration $Configuration -SourcePath $VeeamSourcePath + if($Script:DryRun) + { - $Repository = Initialize-BackupRepository -Configuration $Configuration + Write-Host "" + Write-Host "DRY-RUN aktiviert" -ForegroundColor Yellow - $Jobs = Initialize-BackupJobs -Configuration $Configuration + + $Installation = + Test-DryRunInstallation ` + -SourcePath $VeeamSourcePath ` + -SQLServer $Configuration.SQL.Server ` + -Database $Configuration.SQL.Database + + + $Repository = + Test-DryRunRepository ` + -Name $Configuration.Repository.Name ` + -Path $Configuration.Repository.Path + + + $Jobs = + Test-DryRunBackupJob ` + -Name $Configuration.BackupJob.Name ` + -Repository $Configuration.Repository.Name ` + -RetentionDays $Configuration.Repository.RetentionDays + + } + else + { + + $Installation = + Install-VeeamProduct ` + -Configuration $Configuration ` + -SourcePath $VeeamSourcePath + + + $Repository = + Initialize-BackupRepository ` + -Configuration $Configuration + + + $Jobs = + Initialize-BackupJobs ` + -Configuration $Configuration + + } @@ -763,24 +786,22 @@ function Save-EnterpriseReport { try { - Initialize-Installer - - - Initialize-EnterpriseLog ` - -Name "VeeamEnterprise" + Write-EnterpriseLog ` + -Level INFO ` + -Message "Logging initialisiert" + + + Initialize-Installer + Write-EnterpriseLog ` - -Level INFO ` - -Message "Installer gestartet" - - if($Script:DryRun) {