Version 2.1.0
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
---------------------------------------------------------------------------
|
||||
Module......: Bootstrap.psm1
|
||||
Projekt.....: Veeam Enterprise Installer
|
||||
Version.....: 2.0.1
|
||||
Version.....: 2.1.0
|
||||
Autor.......: ChatGPT & Benutzer
|
||||
PowerShell..: 5.1
|
||||
---------------------------------------------------------------------------
|
||||
@@ -29,7 +29,7 @@ Set-StrictMode -Version Latest
|
||||
#region Script Variablen
|
||||
|
||||
$Script:ProjectName = "Veeam Enterprise Installer"
|
||||
$Script:ProjectVersion = "2.0.1"
|
||||
$Script:ProjectVersion = "2.1.0"
|
||||
|
||||
$Script:RootPath = $null
|
||||
$Script:ModulePath = $null
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
---------------------------------------------------------------------------
|
||||
Module......: VeeamInstallation.psm1
|
||||
Projekt.....: Veeam Enterprise Installer
|
||||
Version.....: 2.0.0
|
||||
Version.....: 2.1.0
|
||||
|
||||
Beschreibung:
|
||||
|
||||
@@ -29,7 +29,7 @@ Set-StrictMode -Version Latest
|
||||
|
||||
#region Variablen
|
||||
|
||||
$Script:VeeamModuleVersion = "2.0.0"
|
||||
$Script:VeeamModuleVersion = "2.1.0"
|
||||
|
||||
$Script:ExpectedVersion =
|
||||
"13.0.1.1071"
|
||||
@@ -310,7 +310,8 @@ function Resolve-VeeamAnswerFile {
|
||||
[ValidateSet("MSSQL", "PostgreSQL")][string]$DatabaseEngine = "MSSQL",
|
||||
[string]$SQLServer,
|
||||
[string]$SQLInstance,
|
||||
[string]$DatabaseName = "VeeamBackup"
|
||||
[string]$DatabaseName = "VeeamBackup",
|
||||
[AllowEmptyString()][string]$LicenseFile
|
||||
)
|
||||
|
||||
if(![string]::IsNullOrWhiteSpace($AnswerFile)) {
|
||||
@@ -318,7 +319,15 @@ function Resolve-VeeamAnswerFile {
|
||||
throw "Explizit angegebene Veeam-Antwortdatei nicht gefunden: $AnswerFile"
|
||||
}
|
||||
|
||||
return (Resolve-Path -LiteralPath $AnswerFile).Path
|
||||
$ExplicitAnswerFile = (Resolve-Path -LiteralPath $AnswerFile).Path
|
||||
return New-VeeamAnswerFileFromTemplate `
|
||||
-TemplatePath $ExplicitAnswerFile `
|
||||
-DestinationPath $ExplicitAnswerFile `
|
||||
-DatabaseEngine $DatabaseEngine `
|
||||
-SQLServer $SQLServer `
|
||||
-SQLInstance $SQLInstance `
|
||||
-DatabaseName $DatabaseName `
|
||||
-LicenseFile $LicenseFile
|
||||
}
|
||||
|
||||
$LocalAnswerFile = Join-Path $LocalConfigPath "VeeamAnswerFile.xml"
|
||||
@@ -370,6 +379,12 @@ function Resolve-VeeamAnswerFile {
|
||||
}
|
||||
}
|
||||
|
||||
$ExpectedLicenseValue = if([string]::IsNullOrWhiteSpace($LicenseFile)) { "0" } else { $LicenseFile }
|
||||
$LicenseNode = $LocalXml.SelectSingleNode("//property[@name='VBR_LICENSE_FILE']")
|
||||
if($null -eq $LicenseNode -or $LicenseNode.value -ne $ExpectedLicenseValue) {
|
||||
$Configured = $false
|
||||
}
|
||||
|
||||
if($Configured) {
|
||||
return (Resolve-Path -LiteralPath $LocalAnswerFile).Path
|
||||
}
|
||||
@@ -380,7 +395,8 @@ function Resolve-VeeamAnswerFile {
|
||||
-DatabaseEngine $DatabaseEngine `
|
||||
-SQLServer $SQLServer `
|
||||
-SQLInstance $SQLInstance `
|
||||
-DatabaseName $DatabaseName
|
||||
-DatabaseName $DatabaseName `
|
||||
-LicenseFile $LicenseFile
|
||||
}
|
||||
|
||||
$SourceRoot = $SourcePath
|
||||
@@ -396,17 +412,14 @@ function Resolve-VeeamAnswerFile {
|
||||
|
||||
foreach($Candidate in $Candidates) {
|
||||
if(Test-Path -LiteralPath $Candidate -PathType Leaf) {
|
||||
if([IO.Path]::GetFileName($Candidate) -eq "VbrAnswerFile_install.xml") {
|
||||
return New-VeeamAnswerFileFromTemplate `
|
||||
-TemplatePath $Candidate `
|
||||
-DestinationPath $LocalAnswerFile `
|
||||
-DatabaseEngine $DatabaseEngine `
|
||||
-SQLServer $SQLServer `
|
||||
-SQLInstance $SQLInstance `
|
||||
-DatabaseName $DatabaseName
|
||||
}
|
||||
|
||||
return (Resolve-Path -LiteralPath $Candidate).Path
|
||||
return New-VeeamAnswerFileFromTemplate `
|
||||
-TemplatePath $Candidate `
|
||||
-DestinationPath $LocalAnswerFile `
|
||||
-DatabaseEngine $DatabaseEngine `
|
||||
-SQLServer $SQLServer `
|
||||
-SQLInstance $SQLInstance `
|
||||
-DatabaseName $DatabaseName `
|
||||
-LicenseFile $LicenseFile
|
||||
}
|
||||
}
|
||||
|
||||
@@ -425,7 +438,8 @@ function Resolve-VeeamAnswerFile {
|
||||
-DatabaseEngine $DatabaseEngine `
|
||||
-SQLServer $SQLServer `
|
||||
-SQLInstance $SQLInstance `
|
||||
-DatabaseName $DatabaseName
|
||||
-DatabaseName $DatabaseName `
|
||||
-LicenseFile $LicenseFile
|
||||
}
|
||||
|
||||
throw "Keine Veeam-Antwortdatei gefunden. Erwartet: Config\VeeamAnswerFile.xml oder DVD-Vorlage VbrAnswerFile_install.xml."
|
||||
@@ -444,7 +458,8 @@ function New-VeeamAnswerFileFromTemplate {
|
||||
[ValidateSet("MSSQL", "PostgreSQL")][string]$DatabaseEngine = "MSSQL",
|
||||
[string]$SQLServer,
|
||||
[string]$SQLInstance,
|
||||
[string]$DatabaseName = "VeeamBackup"
|
||||
[string]$DatabaseName = "VeeamBackup",
|
||||
[AllowEmptyString()][string]$LicenseFile
|
||||
)
|
||||
|
||||
if(!(Test-Path -LiteralPath $TemplatePath -PathType Leaf)) {
|
||||
@@ -507,6 +522,13 @@ function New-VeeamAnswerFileFromTemplate {
|
||||
Set-AnswerProperty -Name $Agreement -Value "1"
|
||||
}
|
||||
|
||||
if([string]::IsNullOrWhiteSpace($LicenseFile)) {
|
||||
Set-AnswerProperty -Name "VBR_LICENSE_FILE" -Value "0"
|
||||
}
|
||||
else {
|
||||
Set-AnswerProperty -Name "VBR_LICENSE_FILE" -Value $LicenseFile
|
||||
}
|
||||
|
||||
if($DatabaseEngine -eq "MSSQL") {
|
||||
if([string]::IsNullOrWhiteSpace($SQLServer) -or [string]::IsNullOrWhiteSpace($SQLInstance)) {
|
||||
throw "Für Microsoft SQL müssen Server und Instanz angegeben sein."
|
||||
|
||||
Reference in New Issue
Block a user