diff --git a/App/DAL/lib.DAL.asp b/App/DAL/lib.DAL.asp index 9f8b72f..4d96862 100644 --- a/App/DAL/lib.DAL.asp +++ b/App/DAL/lib.DAL.asp @@ -21,8 +21,8 @@ dim DAL__Singleton : set DAL__Singleton = Nothing Function DAL() If DAL__Singleton is Nothing then set DAL__Singleton = new Database_Class - DAL__Singleton.Initialize "Provider=Microsoft.Jet.OLEDB.4.0;Jet OLEDB:Engine Type=5;Data Source=" & Request.ServerVariables("APPL_PHYSICAL_PATH") & "Data\webdata - Copy.mdb;" - + ' DAL__Singleton.Initialize "Provider=Microsoft.Jet.OLEDB.4.0;Jet OLEDB:Engine Type=5;Data Source=" & Request.ServerVariables("APPL_PHYSICAL_PATH") & "Data\webdata - Copy.mdb;" + DAL__Singleton.Initialize "Provider=SQLOLEDB;Server=danielsubuntu,15789;Database=tracking;UID=sa;PWD=SunBrightShine!;" End If set DAL = DAL__Singleton End Function diff --git a/CiCd/deploy.vbs b/CiCd/deploy.vbs index afe91e7..f42868a 100644 --- a/CiCd/deploy.vbs +++ b/CiCd/deploy.vbs @@ -1,27 +1,38 @@ Option Explicit Dim DeployMachine:DeployMachine = "KCI-APP01" +Dim remoteDeployPath:remoteDeployPath = "C:\inetpub\tracking" +Dim ScriptDirectory:ScriptDirectory = Replace(WScript.ScriptFullName,WScript.ScriptName,"") Dim DeployRoot:DeployRoot = "F:\Development\Tracking_Kits\CiCd\" '"C:\inetpub\wwwroot\" + Dim fso:Set fso = WScript.CreateObject("Scripting.Filesystemobject") Dim WshShell:Set WshShell = WScript.CreateObject("Wscript.Shell") Dim objShell:Set objShell = CreateObject("Shell.Application") - +Dim transferFolder:transferFolder = "\\KCI-SYN-CL01\PC Transfer\" If fso.FolderExists(DeployRoot & "test") Then WshShell.Run "cmd.exe /c rmdir /s /q """ & DeployRoot & "test""" , 0,True End If CloneRepo ZipRepo -fso.CopyFile DeployRoot & "zzip.zip", "\\KCI-SYN-CL01\PC Transfer\zzip.zip", True -WshShell.CurrentDirectory = DeployRoot Cleanup +Deploy + +Sub Deploy +Debug.WriteLine ScriptDirectory & "PsExec64.exe -i \\" & DeployMachine & " -u ntp\daniel_admin -p BarkHornSlam4* cmd.exe copy """ & _ + transferFolder & "zzip.zip"" " & """" & remoteDeployPath & "\zzip.zip""" & " & tar -xf ""C:\inetpub\tracking\zip.zip"" -C ""C:\inetpub\tracking""" + +WshShell.Run ScriptDirectory & "PsExec64.exe -i \\" & DeployMachine & " -u ntp\daniel_admin -p BarkHornSlam4* cmd.exe /C copy """ & _ + transferFolder & "\zzip.zip"" " & """" & remoteDeployPath & "\zip.zip""" & " & tar -xf ""C:\inetpub\tracking\zip.zip"" -C ""C:\inetpub\tracking""",1,True + + +End Sub Sub Cleanup + WshShell.CurrentDirectory = DeployRoot WshShell.Run "cmd.exe /c rmdir /s /q """ & DeployRoot & "test\""" , 0,True WScript.Sleep 2500 WScript.Sleep 2500 -' fso.DeleteFolder DeployRoot & "test" - WshShell.Run "cmd.exe /c rmdir """ & DeployRoot & "test""" , 0,True fso.DeleteFile DeployRoot & "\zzip.zip" End Sub @@ -41,6 +52,7 @@ Sub ZipRepo Do Until objZip.Items.Count = objFolder.Items.Count WScript.Sleep 200 Loop + fso.CopyFile DeployRoot & "zzip.zip", transferFolder & "zzip.zip", True Set objFolder = nothing End Sub diff --git a/Data/Migrations/migrate.asp b/Data/Migrations/migrate.asp index b05b5d4..76a5f87 100644 --- a/Data/Migrations/migrate.asp +++ b/Data/Migrations/migrate.asp @@ -24,8 +24,8 @@ End Sub 'TODO: This can be refactored by not having the individual migration files auto-add themselves, but then this file must manually add each one using a slightly dIfferent ' naming convention, i.e. given include file 01_Create_Users.asp the command would be Migrations.Add "Migration_01_Create_Users" or such. At least this way is automated. - Migrations.Initialize "Provider=Microsoft.Jet.OLEDB.4.0;Jet OLEDB:Engine Type=5;Data Source=" & Request.ServerVariables("APPL_PHYSICAL_PATH") & "Data\webdata - Copy.mdb;" - +'Migrations.Initialize "Provider=Microsoft.Jet.OLEDB.4.0;Jet OLEDB:Engine Type=5;Data Source=" & Request.ServerVariables("APPL_PHYSICAL_PATH") & "Data\webdata - Copy.mdb;" + Migrations.Initialize "Provider=SQLOLEDB;Server=danielsubuntu,15789;Database=tracking;UID=sa;PWD=SunBrightShine!;" Migrations.Tracing = false %> diff --git a/Dependancies/IDAutomationFontEncoder.dll b/Dependancies/IDAutomationFontEncoder.dll deleted file mode 100644 index 92dfe2a..0000000 Binary files a/Dependancies/IDAutomationFontEncoder.dll and /dev/null differ diff --git a/Dependancies/InstallFontEncoderDLL.exe b/Dependancies/InstallFontEncoderDLL.exe deleted file mode 100644 index 9c708ac..0000000 Binary files a/Dependancies/InstallFontEncoderDLL.exe and /dev/null differ