Add files via upload

Author: EdVassie

Build Scripts/FBConfigBuild.vbs

@@ -112,7 +112,7 @@ Sub SetupReboot(strLabel, strDescription)
   End If
 
   strCmd            = objShell.ExpandEnvironmentStrings("%COMSPEC%") & " /d /k " 
-  strCmd            = strCmd &  "TIMEOUT 2 & " ' Add 2 second delay
+  strCmd            = strCmd &  "TIMEOUT 5 & " ' Add 5 second delay
   strCmd            = strCmd &  strFBPath & """" & strFBCmd & """"
   strCmd            = strCmd & " /Type:" & GetBuildfileValue("Type") & " /SQLVersion:" & GetBuildfileValue("AuditVersion") & " /Instance:" & GetBuildfileValue("Instance") & " /Restart:Yes " 
   strStopAt         = GetBuildFileValue("StopAt")

Build Scripts/FBConfigVar.vbs

@@ -21,7 +21,7 @@ Class FBManageClusterClass
   Dim colNodes, colResources
   Dim objCluster, objNode, objShell, objRE, objResource, objWMI, objWMIClus, objWMIDNS, objWMIReg
   Dim strClusIPV4Address, strClusIPV4Mask, strClusIPV4Network, strClusIPV6Address, strClusIPV6Mask, strClusIPV6Network
-  Dim strClusterNetworkAO, strClusStorage, strClusterHost, strClusterName, strCmd, strCSVRoot
+  Dim strClusterNetworkAO, strClusStorage, strClusterHost, strClusterName, strCmd, strCmdPS, strCSVRoot
   Dim strFailoverClusterDisks, strHKLM, strOSVersion, strPath, strPathNew, strPreferredOwner
   Dim strServer, strSQLVersion, strUserDNSDomain, strUserDNSServer, strWaitLong, strWaitShort
   Dim intIndex
@@ -49,6 +49,7 @@ Private Sub Class_Initialize
   strClusStorage    = GetBuildfileValue("ClusStorage")
   strClusterHost    = GetBuildfileValue("ClusterHost")
   strClusterName    = GetBuildfileValue("ClusterName")
+  strCmdPS          = GetBuildfileValue("CmdPS")
   strCSVRoot        = GetBuildfileValue("CSVRoot")
   strOSVersion      = GetBuildfileValue("OSVersion")
   strPreferredOwner = GetBuildfileValue("PreferredOwner")
@@ -176,9 +177,12 @@ Sub ConnectCluster()
       strClusterHost = "YES"
       strClusterName = UCase(objCluster.Name)
   End Select
+
+  strOSVersion      = GetBuildfileValue("OSVersion")
+  strSQLVersion     = GetBuildfileValue("SQLVersion")
+  Set objWMIClus    = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\mscluster")
   Call SetBuildfileValue("ClusterHost", strClusterHost)
   Call SetBuildfileValue("ClusterName", strClusterName)
-  Set objWMIClus    = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\mscluster")
 
 End Sub
 
@@ -291,6 +295,8 @@ Sub MoveToNode(strClusterGroup, strNode)
   Select Case True
     Case strNode = ""
       strNewNode    = strServer
+    Case Instr("\", strNode) > 0
+      strNewNode    = Left(strNode, Instr("\", strNode) - 1)
     Case Else
       strNewNode    = strNode
   End Select
@@ -991,6 +997,7 @@ Sub SetClusterCmd()
   Call DebugLog("SetClusterCmd:")
   Dim strStatusComplete
 
+  strCmdPS          = GetBuildfileValue("CmdPS")
   strStatusComplete = GetBuildfileValue("StatusComplete")
   Select Case True
     Case GetBuildfileValue("SetupClusterCmdStatus") = strStatusComplete

Build Scripts/FBManageBoot.vbs

@@ -150,8 +150,8 @@ Sub LogClose()
   Call SetBuildfileValue("FBParm",             strCmd)
   Call SetBuildfileValue("FBParmOld",          "")
 
-  Call SetBuildfileValue("AuditEndDate",       Cstr(Date()))
-  Call SetBuildfileValue("AuditEndTime",       Cstr(Time()))
+  Call SetBuildfileValue("AuditEndDate",       GetStdDate(""))
+  Call SetBuildfileValue("AuditEndTime",       GetStdTime(""))
 
 End Sub
 

Build Scripts/FBManageCluster.vbs

@@ -24,7 +24,7 @@ Dim intIdx, intBuiltinDomLen, intNTAuthLen, intServerLen
 Dim strBuiltinDom, strClusterName, strCmd, strCmdSQL, strDirSystemDataBackup
 Dim strGroupDBA, strGroupDBANonSA, strGroupMSA, strHKLM, strHKU, strIsInstallDBA, strKeyPassword, strLocalAdmin
 Dim strNTAuth, strOSVersion, strPath, strProfDir, strProgCacls, strProgReg
-Dim strServer, strSIDDistComUsers, strSSLCert, strSSLCertThumb, strSystemDataSharedPrimary
+Dim strServer, strSIDDistComUsers, strSSLCert, strSSLCertFile, strSSLCertThumb, strSystemDataSharedPrimary
 Dim strTDECert, strUser, strUserAccount, strUserDNSDomain, strWaitShort
 
 
@@ -60,6 +60,7 @@ Private Sub Class_Initialize
   strServer         = GetBuildfileValue("AuditServer")
   strSIDDistComUsers  = GetBuildfileValue("SIDDistComUsers")
   strSSLCert        = GetBuildfileValue("SSLCert")
+  strSSLCertFile    = GetBuildfileValue("SSLCertFile")
   strSSLCertThumb   = GetBuildfileValue("SSLCertThumb")
   strSystemDataSharedPrimary = GetBuildfileValue("SystemDataSharedPrimary")
   strTDECert        = GetBuildfileValue("TDECert")
@@ -946,7 +947,7 @@ End Sub
 
 
 Sub SetSQLDBSSL(strSQLDBPath, strSQLDBAccount)
-  Call DebugLog("SetSQLDBSSL: " & strSQLDBPath & " for " & strSQLDBAccount)
+  Call DebugLog("SetSQLDBSSL: " & strSQLDBAccount)
 
   Call SetCertAuth(strSSLCertThumb, strSQLDBAccount)
 
@@ -959,6 +960,27 @@ Sub SetSQLDBSSL(strSQLDBPath, strSQLDBAccount)
 End Sub
 
 
+Sub SetSSLCert()
+  Call DebugLog("SetSSLCert: " & strAction)
+
+  Select Case True
+    Case GetBuildfileValue("SetSSLSelfCert") = "YES"
+      strCmd        = "POWERSHELL New-SelfSignedCertificate -DNSName ""*." & strUserDNSDomain & """ -FriendlyName """ & strSSLCert & """ -CertStoreLocation ""cert:\LocalMachine\My"" -NotBefore GetDate(-Date ""2001-01-01T00:00:00"") -NotAfter GetDate(-Date ""2999-12-31T23:59:59"") "
+      Call Util_RunExec(strCmd, "", "", -1) ' Attributes: RSA, 2048 bit; Defaults: Client Authentication, Server Authentication; Usable for: Digital Signature, Key Encipherment
+      Call SetBuildMessage(strMsgErrorConfig, "/SetSSLSelfCert: is not yet supported in SQL FineBuild")
+    Case CheckFile(strSSLCertFile) = True
+      strSSLCertThumb = GetPSData("$Cert = Import-Certificate -FilePath """ & "path" & """ -CertStoreLocation ""cert:\LocalMachine\My"" | $Cert.FriendlyName = """ & strSSLCert & """ | $Cert.ThumbPrint")
+      Call SetBuildMessage(strMsgErrorConfig, "/SSLCertFile: is not yet supported in SQL FineBuild")
+    Case Else
+      Call SetBuildMessage(strMsgErrorConfig, "Unable to find /SSLCertFile:" & strSSLCertFile)
+  End Select
+
+  strSSLCertThumb   = GetCertAttr(strSSLCert, "Thumbprint")
+  Call SetBuildfileValue("SSLCertThumb", strSSLCertThumb)
+
+End Sub
+
+
 Sub SetTDECert(strAction)
   Call DebugLog("SetTDECert: " & strAction)
 
@@ -970,7 +992,7 @@ Sub SetTDECert(strAction)
       Call DeleteFile(strPath & ".pvk")
       Call Util_ExecSQL(strCmdSQL & "-Q", """BACKUP CERTIFICATE " & strTDECert & " TO FILE='" & strPath & ".snk' WITH PRIVATE KEY (FILE='" & strPath & ".pvk', ENCRYPTION BY PASSWORD='" & strKeyPassword & "');""", 0)
     Case Else
-      Call Util_ExecSQL(strCmdSQL & "-Q", """CREATE CERTIFICATE " & strTDECert & " FROM FILE='" & strPath & ".snk' WITH PRIVATE KEY (FILE='" & strPath & ".pvk', ENCRYPTION BY PASSWORD='" & strKeyPassword & "');""", -1)
+      Call Util_ExecSQL(strCmdSQL & "-Q", """IF NOT EXISTS (SELECT 1 FROM sys.certificates WHERE name = '" & strTDECert & "') CREATE CERTIFICATE " & strTDECert & " FROM FILE='" & strPath & ".snk' WITH PRIVATE KEY (FILE='" & strPath & ".pvk', DECRYPTION BY PASSWORD='" & strKeyPassword & "');""", -1)
   End Select
 
 End Sub
@@ -1066,6 +1088,10 @@ Sub SetSQLDBSSL(strSQLDBPath, strSQLDBAccount)
   Call FBManageSecurity.SetSQLDBSSL(strSQLDBPath, strSQLDBAccount)
 End Sub
 
+Sub SetSSLCert()
+'  Call FBManageSecurity.SetSSLCert()
+End Sub
+
 Sub SetTDECert(strAction)
   Call FBManageSecurity.SetTDECert(strAction)
 End Sub

Build Scripts/FBManageLog.vbs

@@ -20,7 +20,7 @@ Dim FBManageService: Set FBManageService = New FBManageServiceClass
 
 Class FBManageServiceClass
   Dim objFile, objFolder, objFSO, objShell, objWMIReg
-  Dim strActionSQLAS, strActionSQLDB, strActionSQLRS, strCmd, strClusterName, strInstance, strPath, strResSuffixAS, strResSuffixDB
+  Dim strActionSQLAS, strActionSQLDB, strActionSQLRS, strCmd, strClusterName, strComSpec, strInstance, strPath, strResSuffixAS, strResSuffixDB
   Dim strSetupSQLAS, strSetupSQLDB, strSetupSQLDBCluster, strSetupSQLRS, strSetupSQLRSCluster, strWaitLong, strWaitShort
 
 
@@ -35,6 +35,7 @@ Private Sub Class_Initialize
   strActionSQLDB    = GetBuildfileValue("ActionSQLDB")
   strActionSQLRS    = GetBuildfileValue("ActionSQLRS")
   strClusterName    = GetBuildfileValue("ClusterName")
+  strComSpec        = GetBuildfileValue("ComSpec")
   strInstance       = GetBuildfileValue("Instance")
   strResSuffixAS    = GetBuildfileValue("ResSuffixAS")
   strResSuffixDB    = GetBuildfileValue("ResSuffixDB")
@@ -169,7 +170,7 @@ Sub StopSQLServer()
     Case strSetupSQLDB <> "YES"
       ' Nothing
     Case strSetupSQLDBCluster <> "YES"
-      Call Util_RunExec("%COMSPEC% /D /C NET STOP " & GetBuildfileValue("InstSQL") & " /Y", "", "", 2)
+      Call Util_RunExec(strComSpec & " /D /C NET STOP " & GetBuildfileValue("InstSQL") & " /Y", "", "", 2)
     Case Else
       strCmd        = "CLUSTER """ & strClusterName & """ RESOURCE ""SQL Server" & strResSuffixDB & """ /OFF"
       Call Util_RunExec(strCmd, "", "", -1)
@@ -223,12 +224,12 @@ Private Sub CheckSQLReady()
 
   intFound          = 0
   strDebugMsg1      = "SQL Log File Path: " & strErrorLog
-  strCmd            = "%COMSPEC% /D /C FIND /C """ & strSQLLogReinit & """ """ & strErrorLog & """"
+  strCmd            = strComSpec & " /D /C FIND /C """ & strSQLLogReinit & """ """ & strErrorLog & """"
   Call Util_RunExec(strCmd, "", "", 1)
   If intErrSave = 0 Then
     intFound        = 1   
   End If
-  strCmd            = "%COMSPEC% /D /C FIND /C """ & strRestartComplete & """ """ & strErrorLog & """"
+  strCmd            = strComSpec & " /D /C FIND /C """ & strRestartComplete & """ """ & strErrorLog & """"
   While intFound = 0
     Wscript.Sleep strWaitLong 
     Call Util_RunExec(strCmd, "", "", 1)
@@ -279,7 +280,7 @@ Private Sub CheckSQLAgentReady()
 
   intFound          = 0
   strDebugMsg1      = "SQL Log File Path: " & strErrorLog
-  strCmd            = "%COMSPEC% /D /C FIND /C """ & strRestartComplete & """ """ & strErrorLog & """"
+  strCmd            = strComSpec & " /D /C FIND /C """ & strRestartComplete & """ """ & strErrorLog & """"
   While intFound = 0
     Wscript.Sleep strWaitLong 
     Call Util_RunExec(strCmd, "", "", 1)
@@ -425,7 +426,7 @@ Private Sub CheckRSReady()
 
   intFound          = 0
   strDebugMsg1      = "SSRS Log File: " & strErrorLog 
-  strCmd            = "%COMSPEC% /D /C FIND /C """ & strRestartComplete & """ """ & strPath & "\" & strErrorLog & """"
+  strCmd            = strComSpec & " /D /C FIND /C """ & strRestartComplete & """ """ & strPath & "\" & strErrorLog & """"
   While (intFound = 0) And (strErrorLog > "")
     Call Util_RunExec(strCmd, "", "", 1)
     If intErrSave = 0 Then

Build Scripts/FBManageSecurity.vbs

@@ -227,6 +227,7 @@ End Function
 Function GetCmdSQL()
   Call DebugLog("GetCmdSQL:")
 
+  strServInst       = GetBuildfileValue("ServInst")
   strSQLVersion     = GetBuildfileValue("SQLVersion")
   strSQLVersionNum  = GetBuildfileValue("SQLVersionNum")
   strRegTools       = strHKLMSQL & strSQLVersionNum & "\Tools\ClientSetup\"