From 840fed13eeee66d31bf333f9bcad753132cd3807 Mon Sep 17 00:00:00 2001
From: Martin <martin@urbackup.org>
Date: Tue, 2 Feb 2016 14:07:51 +0100
Subject: [PATCH] Fixed windows installer

---
 build_server.bat                              |  18 --------
 .../data_common/urbackup_dsa.pub              | Bin 443 -> 0 bytes
 .../data_common/urbackup_ecdsa409k1.pub       | Bin 0 -> 436 bytes
 urbackupserver_installer_win/update_data.bat  |   9 ++--
 .../urbackup_server.nsi                       |  43 +-----------------
 5 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 urbackupserver_installer_win/data_common/urbackup_dsa.pub
 create mode 100644 urbackupserver_installer_win/data_common/urbackup_ecdsa409k1.pub

diff --git a/build_server.bat b/build_server.bat
index 97af214f..cbbae286 100644
--- a/build_server.bat
+++ b/build_server.bat
@@ -15,12 +15,6 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 msbuild UrBackupBackend.sln /p:Configuration=Release /p:Platform="x64"
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-msbuild UrBackupBackend.sln /p:Configuration="Release Server PreVista" /p:Platform="win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-msbuild UrBackupBackend.sln /p:Configuration="Release Server PreVista" /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel% 
-
 msbuild UrBackupBackend.sln /p:Configuration="Release Service" /p:Platform="x64"
 if %errorlevel% neq 0 exit /b %errorlevel%
 
@@ -42,18 +36,6 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 mkdir "x64\Release Server"
 copy /Y "urbackupserver\x64\Release Server\*" "x64\Release Server\"
 
-msbuild urbackupserver\urbackupserver.vcxproj /p:Configuration="Release Server PreVista" /p:Platform="x64"
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-mkdir "RRelease Server PreVista"
-copy /Y "urbackupserver\Release Server PreVista\*" "Release Server PreVista\"
-
-msbuild urbackupserver\urbackupserver.vcxproj /p:Configuration="Release Server PreVista" /p:Platform="win32"
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-mkdir "x64\Release Server PreVista"
-copy /Y "urbackupserver\x64\Release Server PreVista\*" "x64\Release Server PreVista\"
-
 call "%~dp0urbackupserver_installer_win/generate_msi.bat"
 if %errorlevel% neq 0 exit /b %errorlevel%
 
diff --git a/urbackupserver_installer_win/data_common/urbackup_dsa.pub b/urbackupserver_installer_win/data_common/urbackup_dsa.pub
deleted file mode 100644
index cf1daaf5730baf70d471cf3e42f20d38a166e81b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 443
zcmV;s0Yv^Vf&sTMf&nZB2P%e0&Nu`CFoFRe0)c@5`YWLh_8tB94=nR<fo)0Zf_n>=
zayGr!6x*p;*N7bt1ZXtnpmY|igl+a9qsmno0o&$7fW_9&-rj7QC#aM9oNzxODefxW
zbI~0EI95PVVj9b7FEo&Pta@7(Uk%ORIFMt8kc;`^^|g}V{VM0gpsj^J*&BUaoKL{8
zX%`|l0u=zv#iOdZ??th~uH>82w>&<~(TXVofq?+Y_DR=iZ<`>1wk&QMe!Xp%EHL6{
zU^2wLuWnn#2Xu?#%?|B`HpkZF`^ZOg>Ydcn`%xuXMC%0^?gXw9kb%3|?*j&_2P)CU
z_ii~oQL{j%VzB;bfd)VfsNvNPa+hfX50cd=PA$v!%>WRe6J_G`vMUwusV7YIp=y+5
zW&M`}frJ18fq+6kv`r?b#bb%`PC3sNf*Y?+B54gZKga@2U9RaKwN4SC%7WAJfAH>7
zu}1O#&D0wq$~j0MB+pgsAM(b|4Mon`VDj)wRbLcrG85bp>vI1a<ZgkV9W&~70`q(M
ly{|4+P0j13gjzhJNeSA8ZbJrlD-@$REoa>?%ww0J0us(;(@6jT

diff --git a/urbackupserver_installer_win/data_common/urbackup_ecdsa409k1.pub b/urbackupserver_installer_win/data_common/urbackup_ecdsa409k1.pub
new file mode 100644
index 0000000000000000000000000000000000000000..12e47f80ec9a0ccfb5a84f6e93133a46fd48302b
GIT binary patch
literal 436
zcmXqLV%%WR#OT1ruGQvo&X$Q0$T4POWHgY4iZC)62r)4+&Sc{RD_~?|2J*rUa#&0l
z$N*&NVr0o=VMzE8pW5$vaIMwGPX59cMZUkB?T^_{_^7WrzvJh(nnOntB<5{hwJPbI
zlHSJ6p$_L?GMT$EKF(z2uJLnPvrBf(eiqF+CJ7b#6Z@8^KQjtUefdh@@vZnAr<X^A
zL|4sOR27l@#^c5Vjcg|4`u{k<zxd`&S6(SN@Er-Qjl2B#`Kf5{nC2Z1<l@gWF|sgc
zF|aUvzo)ci(yQ5@!knUmyT0<x^e8|5P)4;dMdalB(tT~)5)LcNT%CAe<En@2K3A-X
z(NNu*XTfkK>}{}a%aI*RRm!q9+$;5&Ju}4WLV>VWO)2jL_I{n(sdK$H|Gg*pKOruB
MY5T25VR|Vg0KFcX$^ZZW

literal 0
HcmV?d00001

diff --git a/urbackupserver_installer_win/update_data.bat b/urbackupserver_installer_win/update_data.bat
index 7224dcd7..cad23f44 100644
--- a/urbackupserver_installer_win/update_data.bat
+++ b/urbackupserver_installer_win/update_data.bat
@@ -8,12 +8,12 @@ mkdir data
 copy /Y "..\Release Server\urbackupserver.dll" "data\urbackupserver.dll"
 if %errorlevel% neq 0 exit /b %errorlevel% 
 
-copy /Y "..\Release Server PreVista\urbackupserver.dll" "data\urbackupserver_prevista.dll"
-if %errorlevel% neq 0 exit /b %errorlevel% 
-
 copy /Y "..\release\fsimageplugin.dll" "data\fsimageplugin.dll"
 if %errorlevel% neq 0 exit /b %errorlevel% 
 
+copy /Y "..\release\fileservplugin.dll" "data\fileservplugin.dll"
+if %errorlevel% neq 0 exit /b %errorlevel%
+
 mkdir data_common
 
 copy /Y "..\server-license.txt" "data_common\license.txt"
@@ -72,3 +72,6 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 copy /Y "..\x64\Release\cryptoplugin.dll" "data_x64\cryptoplugin.dll"
 if %errorlevel% neq 0 exit /b %errorlevel%
+
+copy /Y "..\x64\release\fileservplugin.dll" "data_x64\fileservplugin.dll"
+if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/urbackupserver_installer_win/urbackup_server.nsi b/urbackupserver_installer_win/urbackup_server.nsi
index fa796caf..711d2586 100644
--- a/urbackupserver_installer_win/urbackup_server.nsi
+++ b/urbackupserver_installer_win/urbackup_server.nsi
@@ -135,14 +135,13 @@ Section "install"
 	
 	SetOutPath "$INSTDIR"
 	File "data_common\args.txt"
-	File "data_common\args_prevista.txt"
 	File "data_common\license.txt"
 	File "data_common\cleanup.bat"
 	File "data_common\remove_unknown.bat"
 	File "data_common\reset_pw.bat"
 	File "data_common\cleanup_database.bat"
 	File "data_common\defrag_database.bat"
-	File "data_common\urbackup_dsa.pub"
+	File "data_common\urbackup_ecdsa409k1.pub"
 	File "data_common\repair_database.bat"
 	File "data_common\export_auth_log.bat"
 	File "data_common\uncompress_image.bat"
@@ -184,49 +183,11 @@ Section "install"
 	SetOutPath "$INSTDIR\urbackup\www\js"
 	File "data_common\urbackup\www\js\*.js"
 	
-	
-	
-	${IfNot} ${RunningX64}
-		${If} ${IsWinXP}
-			StrCpy $0 "$INSTDIR\args_prevista.txt" ;Path of copy file from
-			StrCpy $1 "$INSTDIR\args.txt"   ;Path of copy file to
-			StrCpy $2 0 ; only 0 or 1, set 0 to overwrite file if it already exists
-			System::Call 'kernel32::CopyFile(t r0, t r1, b r2) l'
-			Pop $0
-			;SetRebootFlag true
-		${EndIf}
-		${If} ${IsWin2003}
-			StrCpy $0 "$INSTDIR\args_prevista.txt" ;Path of copy file from
-			StrCpy $1 "$INSTDIR\args.txt"   ;Path of copy file to
-			StrCpy $2 0 ; only 0 or 1, set 0 to overwrite file if it already exists
-			System::Call 'kernel32::CopyFile(t r0, t r1, b r2) l'
-			Pop $0
-			;SetRebootFlag true
-		${EndIf}
-	${Else}
-		${If} ${IsWin2003}
-			StrCpy $0 "$INSTDIR\args_prevista.txt" ;Path of copy file from
-			StrCpy $1 "$INSTDIR\args.txt"   ;Path of copy file to
-			StrCpy $2 0 ; only 0 or 1, set 0 to overwrite file if it already exists
-			System::Call 'kernel32::CopyFile(t r0, t r1, b r2) l'
-			Pop $0
-			;SetRebootFlag true
-		${EndIf}
-	${EndIf}
-	
 	CreateDirectory "$SMPROGRAMS\UrBackup Server"
 	CreateShortCut "$SMPROGRAMS\UrBackup Server\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 	CreateShortCut "$SMPROGRAMS\UrBackup Server\UrBackup Server Interface.lnk" "http://localhost:55414" "" "$INSTDIR\urbackup\www\favico.ico" 0
-	;SetOutPath "$SMPROGRAMS\UrBackup Server"
-	;File "data_common\UrBackup Server Interface.htm"
 	
-	${If} ${IsWinXP}
-		nsisFirewallW::AddAuthorizedApplication "$INSTDIR\urbackup_srv.exe" "UrBackup Windows Server"
-	${ElseIf} ${IsWin2003}
-		nsisFirewallW::AddAuthorizedApplication "$INSTDIR\urbackup_srv.exe" "UrBackup Windows Server"
-	${Else}
-		liteFirewallW::AddRule "$INSTDIR\urbackup_srv.exe" "UrBackup Windows Server"
-	${EndIf}
+	liteFirewallW::AddRule "$INSTDIR\urbackup_srv.exe" "UrBackup Windows Server"
 	Pop $0