From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 22 Jan 2010 18:05:02 +0000 (+0100)
Subject: Remove unused newinstaller directory
X-Git-Tag: Release-5.0.0~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2be077fcc6a70740aa0ba25d3350e5cda3b7d4a3;p=bacula%2Fbacula

Remove unused newinstaller directory
---

diff --git a/bacula/src/win32/newinstaller/ConfigPage1.nsh b/bacula/src/win32/newinstaller/ConfigPage1.nsh
deleted file mode 100644
index 71965a2a38..0000000000
--- a/bacula/src/win32/newinstaller/ConfigPage1.nsh
+++ /dev/null
@@ -1,294 +0,0 @@
-Function EnterConfigPage1
-  ${If} $AutomaticInstall = 1
-    Abort
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}
-
-  ${If} $R0 = 0
-    Abort
-  ${EndIf}
-
-  FileOpen $R5 "$PLUGINSDIR\ConfigPage1.ini" w
-
-  StrCpy $R6 1  ; Field Number
-  StrCpy $R7 0  ; Top
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    IntOp $R8 $R7 + 52
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Client"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
-
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigClientName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigClientPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigClientMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigClientPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 14
-
-    IntOp $R8 $R7 + 10
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigClientInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigClientStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-  ${Endif}
-
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    IntOp $R8 $R7 + 52
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Storage"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
-    
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigStorageName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigStoragePort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 2
-
-    IntOp $R8 $R8 - 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigStorageMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigStoragePassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 14
-
-    IntOp $R8 $R7 + 10
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigStorageInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigStorageStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-  ${Endif}
-
-  IntOp $R6 $R6 - 1
-
-  FileWrite $R5 "[Settings]$\r$\nNumFields=$R6$\r$\n"
-
-  FileClose $R5
-
-  !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage1)" "$(SUBTITLE_ConfigPage1)"
-  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ConfigPage1.ini"
-  Pop $HDLG ;HWND of dialog
-
-  ; Initialize Controls
-
-  StrCpy $R6 1  ; Field Number
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 2
-
-    ; Client Name
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Client Port Number
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 5 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Max Jobs
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 3 0
-
-    IntOp $R6 $R6 + 5
-  ${Endif}
-
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 2
-
-    ; Storage Name
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Storage Port Number
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 5 0
-
-    IntOp $R6 $R6 + 2
-
-    ; Max Jobs
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage1.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 3 0
-
-    IntOp $R6 $R6 + 5
-  ${Endif}
-
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-
-  ; Process results
-
-  StrCpy $R6 3
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientName "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientPort "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientMaxJobs "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientPassword "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientInstallService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigClientStartService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 3
-  ${Endif}
-
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageName "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStoragePort "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageMaxJobs "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStoragePassword "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageInstallService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 1
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigStorageStartService "ConfigPage1.ini" "Field $R6" "State"
-
-    IntOp $R6 $R6 + 3
-  ${Endif}
-FunctionEnd
-
-Function LeaveConfigPage1
-  StrCpy $R6 5
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1024
-    ${OrIf} $R0 > 65535
-      MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1
-    ${OrIf} $R0 > 99
-      MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 9
-  ${Endif}
-  
-  IntOp $R0 $NewComponents & ${ComponentStorage}
-  ${If} $R0 <> 0
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1024
-    ${OrIf} $R0 > 65535
-      MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 2
-
-    !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage1.ini" "Field $R6" "State"
-    ${If} $R0 < 1
-    ${OrIf} $R0 > 99
-      MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
-      Abort
-    ${EndIf}
-
-    IntOp $R6 $R6 + 9
-  ${Endif}
-FunctionEnd
diff --git a/bacula/src/win32/newinstaller/ConfigPage2.nsh b/bacula/src/win32/newinstaller/ConfigPage2.nsh
deleted file mode 100644
index 321d7b98cc..0000000000
--- a/bacula/src/win32/newinstaller/ConfigPage2.nsh
+++ /dev/null
@@ -1,454 +0,0 @@
-Function EnterConfigPage2
-  IntOp $R0 $NewComponents & ${ComponentsRequiringUserConfig}
-
-  ${If} $R0 = 0
-    Abort
-  ${EndIf}
-
-  FileOpen $R5 "$PLUGINSDIR\ConfigPage2.ini" w
-
-  StrCpy $R6 1  ; Field Number
-  StrCpy $R7 0  ; Top
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    ${If} $AutomaticInstall = 1
-      IntOp $R8 $R7 + 54
-    ${Else}
-      IntOp $R8 $R7 + 92
-    ${EndIf}
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R8 $R7 + 54
-    ${Else}
-      IntOp $R8 $R7 + 26
-    ${EndIf}
-    FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Remote Director"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-  ${EndIf}
-
-  IntOp $R6 $R6 + 1
-  IntOp $R7 $R7 + 12
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    ${If} "$ConfigDirectorName" == ""
-      StrCpy $ConfigDirectorName "$HostName-dir"
-    ${EndIf}
-    ${If} "$ConfigDirectorPassword" == ""
-      StrCpy $ConfigDirectorPassword "$LocalDirectorPassword"
-    ${EndIf}
-  ${Else}
-    ${If} "$ConfigDirectorName" == "$HostName-dir"
-      StrCpy $ConfigDirectorName ""
-    ${EndIf}
-    ${If} "$ConfigDirectorPassword" == "$LocalDirectorPassword"
-      StrCpy $ConfigDirectorPassword ""
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R8 $R7 + 8
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-
-    IntOp $R8 $R8 + 2
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=158$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-      ${If} $R0 <> 0
-        IntOp $R7 $R7 + 2
-        IntOp $R8 $R8 - 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Port"$\r$\nLeft=172$\r$\nTop=$R7$\r$\nRight=188$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-        IntOp $R7 $R7 - 2
-
-        IntOp $R8 $R8 + 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorPort$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=218$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-
-      IntOp $R0 $NewComponents & ${ComponentDirector}
-      ${If} $R0 <> 0
-        IntOp $R7 $R7 + 2
-        IntOp $R8 $R8 - 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Max Jobs"$\r$\nLeft=238$\r$\nTop=$R7$\r$\nRight=270$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-        IntOp $R7 $R7 - 2
-
-        IntOp $R8 $R8 + 2
-        FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nFlags="ONLY_NUMBERS"$\r$\nState=$ConfigDirectorMaxJobs$\r$\nLeft=274$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-    ${EndIf}
-
-    IntOp $R7 $R7 + 14
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-  ${If} $R0 <> 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R7 $R7 + 2
-      IntOp $R8 $R7 + 8
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-      IntOp $R8 $R8 + 2
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 14
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    IntOp $R7 $R7 + 2
-    IntOp $R8 $R7 + 8
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Mail Server"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorMailServer$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-    IntOp $R8 $R7 + 8
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Mail Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorMailAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 16
-    IntOp $R8 $R7 + 8
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Database"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 - 2
-    IntOp $R8 $R8 + 2
-
-    ${If} $ConfigDirectorDB = 0
-      ${If} $MySQLPath != ""
-        StrCpy $ConfigDirectorDB 1
-      ${ElseIf} $PostgreSQLPath != ""
-        StrCpy $ConfigDirectorDB 2
-      ${Else}
-        StrCpy $ConfigDirectorDB 3
-      ${EndIf}
-    ${EndIf}
-
-    ${If} $ConfigDirectorDB = 1
-      StrCpy $R9 1
-    ${Else}
-      StrCpy $R9 0
-    ${EndIf}
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="MySQL"$\r$\nFlags="GROUP"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=90$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-
-    ${If} $ConfigDirectorDB = 2
-      StrCpy $R9 1
-    ${Else}
-      StrCpy $R9 0
-    ${EndIf}
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="PostgreSQL"$\r$\nFlags="NOTABSTOP"$\r$\nLeft=94$\r$\nTop=$R7$\r$\nRight=146$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-
-    ${If} $ConfigDirectorDB = 3
-      StrCpy $R9 1
-    ${Else}
-      StrCpy $R9 0
-    ${EndIf}
-
-    FileWrite $R5 '[Field $R6]$\r$\nType="RadioButton"$\r$\nState=$R9$\r$\nText="Sqlite"$\r$\nFlags="NOTABSTOP"$\r$\nLeft=150$\r$\nTop=$R7$\r$\nRight=182$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-    IntOp $R6 $R6 + 1
-    IntOp $R7 $R7 + 12
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R8 $R7 + 10
-      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorInstallService$\r$\nText="Install as service"$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=118$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Checkbox"$\r$\nState=$ConfigDirectorStartService$\r$\nText="Start after install"$\r$\nLeft=190$\r$\nTop=$R7$\r$\nRight=260$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 12
-    ${EndIf}
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R7 $R7 + 2
-      IntOp $R8 $R7 + 8
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Address"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=48$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-      IntOp $R8 $R8 + 2
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigDirectorAddress$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 14
-      IntOp $R8 $R7 + 8
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R7 $R7 + 4
-
-  ${If} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
-    ${If} $R0 <> 0
-      IntOp $R8 $R7 + 42
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="GroupBox"$\r$\nText="Monitor"$\r$\nLeft=0$\r$\nTop=$R7$\r$\nRight=300$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 12
-
-      IntOp $R8 $R7 + 8
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Name"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=26$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-
-      IntOp $R8 $R8 + 2
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorName$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=150$\r$\nBottom=$R8$\r$\n$\r$\n'
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 16
-      IntOp $R8 $R7 + 8
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Label"$\r$\nText="Password"$\r$\nLeft=6$\r$\nTop=$R7$\r$\nRight=38$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 - 2
-      IntOp $R8 $R8 + 2
-
-      FileWrite $R5 '[Field $R6]$\r$\nType="Text"$\r$\nState=$ConfigMonitorPassword$\r$\nLeft=50$\r$\nTop=$R7$\r$\nRight=294$\r$\nBottom=$R8$\r$\n$\r$\n'
-
-      IntOp $R6 $R6 + 1
-      IntOp $R7 $R7 + 20
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R6 $R6 - 1
-  FileWrite $R5 "[Settings]$\r$\nNumFields=$R6$\r$\n"
-
-  FileClose $R5
-
-  IntOp $R0 $NewComponents & ${ComponentsFileAndStorage}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 1
-    !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage1)" "$(SUBTITLE_ConfigPage1)"
-  ${Else}
-    !insertmacro MUI_HEADER_TEXT "$(TITLE_ConfigPage2)" "$(SUBTITLE_ConfigPage2)"
-  ${EndIf}
-
-  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ConfigPage2.ini"
-  Pop $HDLG ;HWND of dialog
-
-  ; Initialize Controls
-  StrCpy $R6 2  ; Field Number
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 0
-    ; Name
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-    SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        ; Port Number
-        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-        SendMessage $HCTL ${EM_LIMITTEXT} 5 0
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-
-      IntOp $R0 $NewComponents & ${ComponentDirector}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        ; Max Jobs
-        !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-        SendMessage $HCTL ${EM_LIMITTEXT} 3 0
-
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-  ${If} $R0 <> 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 9
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${EndIf}
-
-  ${If} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-      !insertmacro MUI_INSTALLOPTIONS_READ $HCTL "ConfigPage2.ini" "Field $R6" "HWND"
-      SendMessage $HCTL ${EM_LIMITTEXT} 30 0
-      IntOp $R6 $R6 + 2
-    ${EndIf}
-  ${EndIf}
-
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-
-  ; Process results
-
-  StrCpy $R6 2
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 = 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorName "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPort "ConfigPage2.ini" "Field $R6" "State"
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-
-      IntOp $R0 $NewComponents & ${ComponentDirector}
-      ${If} $R0 <> 0
-        IntOp $R6 $R6 + 1
-        !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMaxJobs "ConfigPage2.ini" "Field $R6" "State"
-        IntOp $R6 $R6 + 1
-      ${EndIf}
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-  ${If} $R0 <> 0
-  ${OrIf} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorPassword "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentDirector}
-  ${If} $R0 <> 0
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMailServer "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 2
-    !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorMailAddress "ConfigPage2.ini" "Field $R6" "State"
-    IntOp $R6 $R6 + 2
-    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R5 = 1
-      StrCpy $ConfigDirectorDB 1
-    ${Endif}
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R5 = 1
-      StrCpy $ConfigDirectorDB 2
-    ${Endif}
-    IntOp $R6 $R6 + 1
-    !insertmacro MUI_INSTALLOPTIONS_READ $R5 "ConfigPage2.ini" "Field $R6" "State"
-    ${If} $R5 = 1
-      StrCpy $ConfigDirectorDB 3
-    ${Endif}
-    IntOp $R6 $R6 + 1
-
-    ${If} $AutomaticInstall = 0
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorInstallService "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorStartService "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${Else}
-    IntOp $R0 $NewComponents & ${ComponentsTextAndGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigDirectorAddress "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${EndIf}
-
-  ${If} $AutomaticInstall = 0
-    IntOp $R0 $NewComponents & ${ComponentsFileAndStorageAndDirector}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 2
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorName "ConfigPage2.ini" "Field $R6" "State"
-      IntOp $R6 $R6 + 2
-      !insertmacro MUI_INSTALLOPTIONS_READ $ConfigMonitorPassword "ConfigPage2.ini" "Field $R6" "State"
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
-
-Function LeaveConfigPage2
-  ${If} $AutomaticInstall = 0
-    StrCpy $R6 4
-
-    IntOp $R0 $NewComponents & ${ComponentsDirectorAndTextGuiConsoles}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
-      ${If} $R0 < 1024
-      ${OrIf} $R0 > 65535
-        MessageBox MB_OK "Port must be between 1024 and 65535 inclusive."
-        Abort
-      ${EndIf}
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-
-    IntOp $R0 $NewComponents & ${ComponentDirector}
-    ${If} $R0 <> 0
-      IntOp $R6 $R6 + 1
-      !insertmacro MUI_INSTALLOPTIONS_READ $R0 "ConfigPage2.ini" "Field $R6" "State"
-      ${If} $R0 < 1
-      ${OrIf} $R0 > 99
-        MessageBox MB_OK "Max Jobs must be between 1 and 99 inclusive."
-        Abort
-      ${EndIf}
-      IntOp $R6 $R6 + 1
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
diff --git a/bacula/src/win32/newinstaller/DumpLog.nsh b/bacula/src/win32/newinstaller/DumpLog.nsh
deleted file mode 100644
index c450044a80..0000000000
--- a/bacula/src/win32/newinstaller/DumpLog.nsh
+++ /dev/null
@@ -1,46 +0,0 @@
-!define LVM_GETITEMCOUNT 0x1004
-!define LVM_GETITEMTEXT 0x102D
-
-Function DumpLog
-  Exch $5
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $6
-
-  FindWindow $0 "#32770" "" $HWNDPARENT
-  GetDlgItem $0 $0 1016
-  StrCmp $0 0 error
-  FileOpen $5 $5 "w"
-  StrCmp $5 0 error
-    SendMessage $0 ${LVM_GETITEMCOUNT} 0 0 $6
-    System::Alloc ${NSIS_MAX_STRLEN}
-    Pop $3
-    StrCpy $2 0
-    System::Call "*(i, i, i, i, i, i, i, i, i) i \
-      (0, 0, 0, 0, 0, r3, ${NSIS_MAX_STRLEN}) .r1"
-    loop: StrCmp $2 $6 done
-      System::Call "User32::SendMessageA(i, i, i, i) i \
-        ($0, ${LVM_GETITEMTEXT}, $2, r1)"
-      System::Call "*$3(&t${NSIS_MAX_STRLEN} .r4)"
-      FileWrite $5 "$4$\r$\n"
-      IntOp $2 $2 + 1
-      Goto loop
-    done:
-      FileClose $5
-      System::Free $1
-      System::Free $3
-      Goto exit
-  error:
-    MessageBox MB_OK error
-  exit:
-    Pop $6
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-    Exch $5
-FunctionEnd
diff --git a/bacula/src/win32/newinstaller/InstallType.ini b/bacula/src/win32/newinstaller/InstallType.ini
deleted file mode 100644
index 62c88cf6da..0000000000
--- a/bacula/src/win32/newinstaller/InstallType.ini
+++ /dev/null
@@ -1,51 +0,0 @@
-[Settings]
-NumFields=6
-
-[Field 1]
-Type=Label
-Text=This is a new installation.  Please choose the installation type.
-Left=0
-Right=300
-Top=0
-Bottom=28
-
-[Field 2]
-Type=GroupBox
-Text=Installation Type
-Left=0
-Right=300
-Top=32
-Bottom=136
-
-[Field 3]
-Type=RadioButton
-Text=Automatic
-State=1
-Left=6
-Right=52
-Top=44
-Bottom=54
-
-[Field 4]
-Type=RadioButton
-Text=Custom
-Left=6
-Right=44
-Top=90
-Bottom=100
-
-[Field 5]
-Type=Label
-Text=The software will be installed in the default directory "Program Files\\Bacula".  The configuration files will be generated using defaults applicable to most installations.
-Left=17
-Right=295
-Top=58
-Bottom=86
-
-[Field 6]
-Type=Label
-Text=You may choose the installation directory.  The configuration defaults will be displayed and you will be given the chance to make changes before the configuration files are written.
-Left=17
-Right=295
-Top=104
-Bottom=132
diff --git a/bacula/src/win32/newinstaller/InstallType.nsh b/bacula/src/win32/newinstaller/InstallType.nsh
deleted file mode 100644
index 0a0f902532..0000000000
--- a/bacula/src/win32/newinstaller/InstallType.nsh
+++ /dev/null
@@ -1,98 +0,0 @@
-Function EnterInstallType
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ; Check if this is an upgrade by looking for an uninstaller configured 
-  ; in the registry.
-  ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString"
-
-  ${If} "$R0" != ""
-    ; Check registry for new installer
-    ReadRegStr $R1 HKLM "Software\Bacula" "InstallLocation"
-    ${If} "$R1" != ""
-      ; New Installer 
-      StrCpy $OldInstallDir $R1
-      StrCpy $InstallType ${UpgradeInstall}
-
-      SetShellVarContext all
-
-      StrCpy $R1 "$APPDATA\Bacula"
-      StrCpy $R2 "$INSTDIR\Doc"
-
-      ReadRegDWORD $PreviousComponents HKLM "Software\Bacula" "Components"
-
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "A previous installation has been found in $OldInstallDir.  Please choose the installation type for any additional components you select."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The configuration files for additional components will be generated using defaults applicable to most installations."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "Text" "The configuration defaults for additional components will be displayed and you will be given the chance to make changes before the configuration files are written."
-
-      ReadRegDWORD $ConfigDirectorDB HKLM Software\Bacula Database
-
-      ${If} $ConfigDirectorDB = 0
-        IntOp $R0 $PreviousComponents & ${ComponentDirector}
-        ${If} $R0 <> 0
-          StrCpy $ConfigDirectorDB 1
-        ${EndIf}
-      ${EndIf}
-    ${Else}
-      ; Processing Upgrade - Get Install Directory
-      ${StrRep} $R0 $R0 '"' ''
-      ${GetParent} $R0 $OldInstallDir
-
-      ; Old Installer 
-      StrCpy $InstallType ${MigrateInstall}
-      StrCpy $R1 "$OldInstallDir\bin"
-      StrCpy $R2 "$OldInstallDir\Doc"
-
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 1" "Text" "An old installation has been found in $OldInstallDir.  The Configuration will be migrated.  Please choose the installation type for any additional components you select."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The software will be installed in the default directory $\"$PROGRAMFILES\Bacula$\".  The configuration files for additional components will be generated using defaults applicable to most installations."
-      WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 6" "Text" "You may choose the installation directory.  The configuration defaults will be displayed and you will be given the chance to make changes before the configuration files are written."
-    ${EndIf}
-  ${Else}
-    ; New Install
-    StrCpy $InstallType ${NewInstall}
-    WriteINIStr "$PLUGINSDIR\InstallType.ini" "Field 5" "Text" "The software will be installed in the default directory $\"$PROGRAMFILES\Bacula$\".  The configuration files will be generated using defaults applicable to most installations."
-  ${EndIf}
-
-  ${If} $InstallType <> ${NewInstall}
-  ${AndIf} $PreviousComponents = 0
-    ${If} ${FileExists} "$R1\bacula-fd.conf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentFile}
-    ${EndIf}
-    ${If} ${FileExists} "$R1\bconsole.conf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentTextConsole}
-    ${EndIf}
-    ${If} ${FileExists} "$R1\wx-console.conf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentGUIConsole}
-    ${EndIf}
-    ${If} ${FileExists} "$R2\bacula.pdf"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentPDFDocs}
-    ${EndIf}
-    ${If} ${FileExists} "$R2\bacula\bacula.html"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}
-    ${EndIf}
-    ${If} ${FileExists} "$R2\bacula.html"
-      IntOp $PreviousComponents $PreviousComponents | ${ComponentHTMLDocs}
-    ${EndIf}
-  ${EndIf}
-
-  !InsertMacro MUI_HEADER_TEXT "$(TITLE_InstallType)" "$(SUBTITLE_InstallType)"
-  !InsertMacro MUI_INSTALLOPTIONS_INITDIALOG "InstallType.ini"
-  Pop $HDLG ;HWND of dialog
-
-  !insertmacro MUI_INSTALLOPTIONS_SHOW
-
-  ; Process Results
-
-  !insertmacro MUI_INSTALLOPTIONS_READ $R0 "InstallType.ini" "Field 3" "State"
-
-  ${If} $R0 = 1
-    StrCpy $AutomaticInstall 1
-  ${Else}
-    StrCpy $AutomaticInstall 0
-  ${EndIf}
-
-  Pop $R2
-  Pop $R1
-  Pop $R0
-FunctionEnd
diff --git a/bacula/src/win32/newinstaller/Makefile b/bacula/src/win32/newinstaller/Makefile
deleted file mode 100644
index 2872474ac4..0000000000
--- a/bacula/src/win32/newinstaller/Makefile
+++ /dev/null
@@ -1,182 +0,0 @@
-#
-# Makefile for win32 bacula executables
-# Using MinGW cross-compiler on GNU/Linux
-#
-#  Written by Robert Nelson, June 2006
-#
-
-include ../Makefile.inc
-
-VERSION := $(shell sed -ne 's/.*[ \t]VERSION[ \t][ \t]*"\(.*\)"/\1/p' < ../../version.h)
-
-DEFINES := \
-	-DVERSION=$(VERSION) \
-	-DOUT_DIR=..\\release32 \
-	-DSRC_DIR=release32 \
-	-DBUILD_TOOLS=MinGW \
-
-INSTALL_EXE := $(BUILDDIR)/release32/winbacula-$(VERSION).exe
-
-BACULA_BINARIES := \
-	bacula.dll \
-	cats_mysql.dll \
-	cats_postgresql.dll \
-	cats_sqlite3.dll \
-	exchange-fd.dll \
-	bacula-dir.exe \
-	bacula-fd.exe \
-	bacula-sd.exe \
-	bconsole.exe \
-	bcopy.exe \
-	bextract.exe \
-	bls.exe \
-	bscan.exe \
-	bsleep.exe \
-	bsmtp.exe \
-	btape.exe \
-	dbcheck.exe \
-	scsilist.exe \
-	bwx-console.exe
-
-DEPKGS_BINARIES := \
-	libeay32.dll \
-	pthreadGCE.dll \
-	ssleay32.dll \
-	zlib1.dll \
-	sqlite3.exe \
-	openssl.exe \
-	loaderinfo.exe \
-	mt.exe \
-	mtx.exe \
-	scsitape.exe \
-	sed.exe \
-	tapeinfo.exe \
-	expr64.exe \
-	snooze.exe \
-	mkisofs.exe \
-	growisofs.exe \
-	dvd-ram-control.exe \
-	dvd+rw-booktype.exe \
-	dvd+rw-format.exe \
-	dvd+rw-mediainfo.exe \
-	wxbase28_gcc_bacula.dll \
-	wxmsw28_core_gcc_bacula.dll
-
-NONGCC_BINARIES := \
-	libmysql.dll
-
-NONGCC_LIBRARIES := \
-	libpq.dll
-
-MINGW_BINARIES := \
-	mingwm10.dll
-
-SCRIPT_FILES := \
-	mtx-changer.cmd \
-	disk-changer.cmd \
-	dvd-handler.cmd
-
-CAT_FILES := \
-	create_mysql_database.cmd \
-	drop_mysql_database.cmd \
-	make_mysql_tables.cmd \
-	make_mysql_tables.sql \
-	drop_mysql_tables.cmd \
-	drop_mysql_tables.sql \
-	grant_mysql_privileges.cmd \
-	grant_mysql_privileges.sql \
-	make_mysql_catalog_backup.cmd \
-	create_postgresql_database.cmd \
-	create_postgresql_database.sql \
-	drop_postgresql_database.cmd \
-	make_postgresql_tables.cmd \
-	make_postgresql_tables.sql \
-	drop_postgresql_tables.cmd \
-	drop_postgresql_tables.sql \
-	grant_postgresql_privileges.cmd \
-	grant_postgresql_privileges.sql \
-	make_postgresql_catalog_backup.cmd \
-	create_sqlite3_database.cmd \
-	drop_sqlite3_database.cmd \
-	make_sqlite3_tables.cmd \
-	make_sqlite3_tables.sql \
-	drop_sqlite3_tables.cmd \
-	grant_sqlite3_privileges.cmd \
-	make_sqlite3_catalog_backup.cmd \
-	delete_catalog_backup.cmd
-
-DIRD_FILES := \
-	query.sql
-
-SSL_FILES := \
-	openssl.cnf
-
-DOC_FILES := \
-	manual/bacula.pdf \
-	manual/bacula/*.html \
-	manual/bacula/*.png  \
-	manual/bacula/*.css
-
-##########################################################################
-
-# Targets
-
-.PHONY: all clean installer
-
-all:		$(INSTALL_EXE)
-
-installer:	$(INSTALL_EXE)
-
-clean:
-	@echo "Cleaning `pwd`"
-	$(CMD_ECHO)-rm -f $(INSTALL_EXE)
-	$(CMD_ECHO)-rm -rf release32
-
-#
-# Rules
-#
-
-define Convert_Binary
-release32/$$(notdir $(1)): $(1)
-	$$(call checkdir,$$@)
-	$(ECHO_CMD)cp -f $$^ $$@ ; \
-	$(STAB2CV) $$@
-endef
-
-define Copy_Binary
-release32/$$(notdir $(1)): $(1)
-	$$(call checkdir,$$@)
-	$(ECHO_CMD)cp -f $$^ $$@
-endef
-
-define Copy_Docs
-release32/$(1): $(DOCDIR)/$(1)
-	$$(call checkdir,$$@)
-	$(ECHO_CMD)cp -f $$^ $$(dir $$@)
-endef
-
-$(foreach file,$(addprefix $(DEPKGS)/bin/, $(DEPKGS_BINARIES)),$(eval $(call Convert_Binary,$(file))))
-
-$(foreach file,$(addprefix $(DEPKGS)/bin/, $(NONGCC_BINARIES)),$(eval $(call Copy_Binary,$(file))))
-
-$(foreach file,$(addprefix $(DEPKGS)/lib/, $(NONGCC_LIBRARIES)),$(eval $(call Copy_Binary,$(file))))
-
-$(foreach file,$(addprefix $(BINDIR)/, $(BACULA_BINARIES)),$(eval $(call Convert_Binary,$(file))))
-
-$(foreach file,$(addprefix $(MINGW_DLLDIR)/, $(MINGW_BINARIES)),$(eval $(call Copy_Binary,$(file))))
-
-$(foreach file,$(addprefix $(DEPKGS)/ssl/, $(SSL_FILES)),$(eval $(call Copy_Binary,$(file))))
-
-$(foreach file,$(addprefix ../scripts/, $(SCRIPT_FILES)),$(eval $(call Copy_Binary,$(file))))
-
-$(foreach file,$(addprefix ../cats/, $(CAT_FILES)),$(eval $(call Copy_Binary,$(file))))
-
-$(foreach file,$(addprefix ../../dird/, $(DIRD_FILES)),$(eval $(call Copy_Binary,$(file))))
-
-$(foreach file,$(DOC_FILES),$(eval $(call Copy_Docs,$(file))))
-
-$(INSTALL_EXE): winbacula.nsi $(addprefix release32/,$(BACULA_BINARIES) $(SCRIPT_FILES) $(CAT_FILES) $(DEPKGS_BINARIES) $(NONGCC_BINARIES) $(NONGCC_LIBRARIES) $(MINGW_BINARIES) $(SSL_FILES) $(DIRD_FILES) $(DOC_FILES))
-	NSISDIR=$(NSIS_DIR) \
-	$(NSIS_DIR)/makensis -V3 $(DEFINES) winbacula.nsi
-
-include $(BUILDDIR)/Makefile.rules
diff --git a/bacula/src/win32/newinstaller/Readme.txt b/bacula/src/win32/newinstaller/Readme.txt
deleted file mode 100755
index 5535f9b8cf..0000000000
--- a/bacula/src/win32/newinstaller/Readme.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-Bacula - Windows Version Disclaimer
-===================================
-
-Please note, only the Win32 Client (File daemon) is supported.  All the
-other components (Director, Storage daemon, their utilities) are provided
-on an "as is" basis.  Unfortunately, they are neither properly tested,   
-documented, or supported.  This means that we cannot ensure that bug reports
-against the non-supported components will be fixed.  For them to be supported, 
-we need three things from the Open Source community:
-
-1. Full documentation of the Windows particularities of the Director,
-   the Storage daemon, and their utilities in the Bacula manual.
-
-2. Someone to periodically and on demand run the regressions tests.
-
-3. One or more developers who are willing to accept and correct Windows
-   related bugs as they occur.
-
-4. A certain Win32 community that will respond to user support questions
-   on the bacula-users list.  (This is probably already fullfilled). 
-             
-
-Bacula - Windows Version Notes
-==============================
-
-These notes highlight how the Windows version of Bacula differs from the 
-other versions.  It also provides any notes additional to the documentation.
-
-For detailed documentation on using, configuring and troubleshooting Bacula,
-please consult the installed documentation or the online documentation at
-http://www.bacula.org/?page=documentation.
-
-
-Start Menu Items
-----------------
-A number of menu items have been created in the Start menu under All Programs
-in the Bacula submenu.  They may be selected to edit the configuration files,
-view the documentation or run one of the console or utility programs.  The 
-choices available will vary depending on the options you chose to install.
-
-
-File Locations
---------------
-The programs and documentation are installed in the directory 
-"C:\Program Files\Bacula" unless a different directory was selected during
-installation.  The configuration and other application data files are in the
-"C:\Documents and Settings\All Users\Application Data\Bacula" directory.
-
-Code Page Problems
--------------------
-Please note that Bacula expects the contents of the configuration files to be 
-written in UTF-8 format. Some translations of "Application Data" have accented
-characters, and apparently the installer writes this translated data in the
-standard Windows code page coding.  This occurs for the Working Directory, and 
-when it happens the daemon will not start since Bacula cannot find the directory.
-The workaround is to manually edit the appropriate conf file and ensure that it
-is written out in UTF-8 format.
-
-The conf files can be edited with any UTF-8 compatible editor, or on most 
-modern Win32 machines, you can edit them with notepad, then choose UTF-8
-output encoding before saving them.
-
-
-Storage and Director Services
------------------------------
-These services are still considered experimental in this release.  Use of 
-them should be approached with caution since they haven't received the
-same level of extensive usage and testing that the File service has 
-received.
-
-Storage Device Names
---------------------
-There is a utility installed called scsilist.exe which displays the installed 
-devices, their physical address and their device name.  A link to it is 
-created in the Bacula menu when the Storage service is installed.
-
-Changer and Tape device names in Windows are Changer0, Changer1, etc and 
-Tape0, Tape1, etc.  If there isn't a device driver loaded for the Changer 
-then you need to use the address <Port>:<Bus>:<Target>:<Lun>.  Port is the 
-SCSI Adapter Number, Bus is the Bus Number on the adapter (usually 0 since 
-most adapters only have one bus), Target is the device's Target Device ID, 
-Lun is the Logical Unit Number.
- 
-You must specify DeviceType = tape in the Device resource in bacula-sd.conf 
-since auto detection of device type doesn't work at the present time.
diff --git a/bacula/src/win32/newinstaller/Start.bat b/bacula/src/win32/newinstaller/Start.bat
deleted file mode 100644
index 0b61f7ec1d..0000000000
--- a/bacula/src/win32/newinstaller/Start.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-rem
-rem Bacula start file for Win95/98/Me
-rem
-cd c:\bacula\bin
-c:\bacula\bin\bacula-fd.exe /service -c c:\bacula\bin\bacula-fd.conf
diff --git a/bacula/src/win32/newinstaller/Stop.bat b/bacula/src/win32/newinstaller/Stop.bat
deleted file mode 100644
index 3b1d0e5b91..0000000000
--- a/bacula/src/win32/newinstaller/Stop.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-rem
-rem Bacula stop file for Win95/98/Me
-rem
-cd c:\bacula\bin
-c:\bacula\bin\bacula-fd.exe /kill
diff --git a/bacula/src/win32/newinstaller/WriteTemplates.ini b/bacula/src/win32/newinstaller/WriteTemplates.ini
deleted file mode 100644
index c3c0aad8c6..0000000000
--- a/bacula/src/win32/newinstaller/WriteTemplates.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[Settings]
-NumFields=5
-CancelEnabled=0
-BackEnabled=0
-
-[Field 1]
-Type="Label"
-Text="Templates of the Client and Storage resources can be generated that are customized with the information about this system.  These templates can then be copied to the Director computer and included in the Director's configuration file."
-Left=7
-Right=293
-Top=6
-Bottom=32
-
-[Field 2]
-Type="CheckBox"
-Text="Client"
-Left=6
-Right=40
-Top=38
-Bottom=48
-
-[Field 3]
-Type="FileRequest"
-State="Client.conf"
-Flags=
-Filter=Configuration Files|*.conf|All Files|*.*
-Left=16
-Right=288
-Top=50
-Bottom=62
-
-[Field 4]
-Type="CheckBox"
-Text="Storage"
-Left=6
-Right=48
-Top=70
-Bottom=80
-
-[Field 5]
-Type="FileRequest"
-State="Storage.conf"
-Flags=REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST
-Filter=Configuration Files|*.conf|All Files|*.*
-Left=16
-Right=288
-Top=82
-Bottom=94
diff --git a/bacula/src/win32/newinstaller/bacula-dir.conf.in b/bacula/src/win32/newinstaller/bacula-dir.conf.in
deleted file mode 100644
index 8a53eeee08..0000000000
--- a/bacula/src/win32/newinstaller/bacula-dir.conf.in
+++ /dev/null
@@ -1,384 +0,0 @@
-#
-# Default Bacula Director Configuration file
-#
-#  The only thing that MUST be changed is to add one or more
-#   file or directory names in the Include directive of the
-#   FileSet resource.
-#
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
-#
-#  You might also want to change the default email address
-#   from root to your address.  See the "mail" and "operator"
-#   directives in the Messages resource.
-#
-
-Director {                            # define myself
-  Name = @director_name@
-  DIRport = @director_port@                # where we listen for UA connections
-  QueryFile = "@bin_dir@\\query.sql"
-  WorkingDirectory = "@working_dir@"
-  PidDirectory = "@working_dir@"
-  Maximum Concurrent Jobs = @director_maxjobs@
-  Password = "@director_password@"         # Console password
-  Messages = Daemon
-}
-
-JobDefs {
-  Name = "DefaultJob"
-  Type = Backup
-  Level = Incremental
-  Client = @client_name@
-  FileSet = "Test Set"
-  Schedule = "WeeklyCycle"
-  Storage = File
-  Messages = Standard
-  Pool = Default
-  Priority = 10
-}
-
-
-#
-# Define the main nightly save backup job
-#   By default, this job will back up to disk in C:/tmp
-Job {
-  Name = "Client1"
-  JobDefs = "DefaultJob"
-  Write Bootstrap = "@working_dir@\\Client1.bsr"
-}
-
-#Job {
-#  Name = "Client2"
-#  Client = @client_name@2
-#  JobDefs = "DefaultJob"
-#  Write Bootstrap = "@working_dir@\\Client2.bsr"
-#}
-
-# Backup the catalog database (after the nightly save)
-Job {
-  Name = "BackupCatalog"
-  JobDefs = "DefaultJob"
-  Level = Full
-  FileSet="Catalog"
-  Schedule = "WeeklyCycleAfterBackup"
-  # This creates an ASCII copy of the catalog
-  RunBeforeJob = "\"@bin_dir@\\make_catalog_backup\" bacula bacula"
-  # This deletes the copy of the catalog
-  RunAfterJob  = "\"@bin_dir@\\delete_catalog_backup\""
-  Write Bootstrap = "@working_dir@\\BackupCatalog.bsr"
-  Priority = 11                   # run after main backup
-}
-
-#
-# Standard Restore template, to be changed by Console program
-#  Only one such job is needed for all Jobs/Clients/Storage ...
-#
-Job {
-  Name = "RestoreFiles"
-  Type = Restore
-  Client=@client_name@
-  FileSet="Test Set"
-  Storage = File
-  Pool = Default
-  Messages = Standard
-  Where = "C:\\tmp\\bacula-restores"
-}
-
-#
-# Note: Windows path separators do NOT work correctly in FileSets.
-#
-# List of files to be backed up
-FileSet {
-  Name = "Test Set"
-  Include {
-    Options {
-      signature = MD5
-      ignore case = yes
-    }
-#    
-#  Put your list of files here, preceded by 'File =', one per line
-#    or include an external list with:
-#
-#    File = <file-name
-#
-#  Note: C:/ backs up everything on drive C.
-#    if you have other drives such as D:/
-#    you will probably want to add them too.
-#
-#  By default this is defined to point to the Bacula 
-#    directory to give a reasonable FileSet to backup to
-#    disk storage during initial testing.
-#
-    File = "@BUILD_DIR@"
-  }
-
-#
-# If you backup the root directory, the following excluded
-#   files can be useful
-#
-  Exclude {
-    Options {
-      signature = MD5
-      ignore case = yes
-    }
-    File = C:/Temp
-    File = C:/tmp
-  }
-}
-
-#
-# This is an example which will backup all the hard drives of a Windows System.
-#
-FileSet {
-  Name = "Windows Full Set"
-  Enable VSS = yes
-  Include {
-    Options {
-      Signature = MD5
-      Exclude = yes
-      IgnoreCase = yes
-      EnhancedWild = yes
-      DriveType = fixed
-
-      # Exclude directories full of lots and lots of useless little files
-      WildDir = "[A-Z]:/Documents and Settings/*/Cookies"
-      WildDir = "[A-Z]:/Documents and Settings/*/Recent"
-      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/History"
-      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/Temp"
-      WildDir = "[A-Z]:/Documents and Settings/*/{Local Settings,LOCALS~1}/Temporary Internet Files"
-
-      # Exclude directories full of lots and lots of useless little files
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/Cookies"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/Recent"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/History"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/Temp"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Profiles/*/{Local Settings,LOCALS~1}/Temporary Internet Files"
-
-      # Exclude directories full of lots and lots of useless little files
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/Cookies"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/Recent"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/History"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/Temp"
-      WildDir = "[A-Z]:/{WINNT,Windows}/system32/config/systemprofile/{Local Settings,LOCALS~1}/Temporary Internet Files"
-
-      # Some random bits of Windows we want to ignore
-      WildDir = "[A-Z]:/{WINNT,Windows}/Prefetch"
-      WildDir = "[A-Z]:/{WINNT,Windows}/msdownld.tmp"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Internet Logs"
-      WildDir = "[A-Z]:/{WINNT,Windows}/$Nt*Uninstall*"
-      WildDir = "[A-Z]:/{WINNT,Windows}/Downloaded Installations"
-
-      # Temporary directories & files
-      WildDir = "[A-Z]:/{WINNT,Windows}/Temp"
-      WildDir = "[A-Z]:/Temp"
-      WildFile = "*.tmp"
-      WildDir = "[A-Z]:/tmp"
-
-      # Fast Find
-      WildFile = "[A-Z]:/ffastun*"
-
-      # System Restore
-      WildDir = "[A-Z]:/System Volume Information"
-
-      # Windows Update
-      WildDir = "[A-Z]:/WUTemp"
-
-      # Recycle bins
-      WildDir = "[A-Z]:/RECYCLE[DR]"
-
-      # Swap files
-      WildFile = "[A-Z]:/pagefile.sys"
-      WildFile = "[A-Z]:/hiberfil.sys"
-
-      # These are programs and are easier to reinstall than restore from
-      # backup
-      WildDir = "[A-Z]:/cygwin"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Java"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Java Web Start"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/JavaSoft"
-      WildDir = "[A-Z]:/{Program Files,PROGRA~1}/Microsoft Office"
-    }
-
-    File = "C:/"
-    File = "D:/"
-    File = "E:/"
-    File = "F:/"
-    File = "G:/"
-    File = "H:/"
-    File = "I:/"
-    File = "J:/"
-    File = "K:/"
-    File = "L:/"
-    File = "M:/"
-    File = "N:/"
-    File = "O:/"
-    File = "P:/"
-    File = "Q:/"
-    File = "R:/"
-    File = "S:/"
-    File = "T:/"
-    File = "U:/"
-    File = "V:/"
-    File = "W:/"
-    File = "X:/"
-    File = "Y:/"
-    File = "Z:/"
-  }
-}
-
-#
-# When to do the backups, full backup on first sunday of the month,
-#  differential (i.e. incremental since full) every other sunday,
-#  and incremental backups other days
-Schedule {
-  Name = "WeeklyCycle"
-  Run = Full 1st sun at 23:05
-  Run = Differential 2nd-5th sun at 23:05
-  Run = Incremental mon-sat at 23:05
-}
-
-# This schedule does the catalog. It starts after the WeeklyCycle
-Schedule {
-  Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 23:10
-}
-
-# This is the backup of the catalog
-FileSet {
-  Name = "Catalog"
-  Include {
-    Options {
-      signature = MD5
-    }
-    File = "@working_dir@\\bacula.sql"
-  }
-}
-
-# Client (File Services) to backup
-Client {
-  Name = @client_name@
-  Address = @client_address@
-  FDPort = @client_port@
-  Catalog = MyCatalog
-  Password = "@client_password@"      # password for FileDaemon
-  File Retention = 30 days            # 30 days
-  Job Retention = 6 months            # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
-}
-
-#
-# Second Client (File Services) to backup
-#  You should change Name, Address, and Password before using
-#
-#Client {
-#  Name = @client_name@2
-#  Address = @client_address@2
-#  FDPort = @client_port@
-#  Catalog = MyCatalog
-#  Password = "@client_password@2"     # password for FileDaemon 2
-#  File Retention = 30 days            # 30 days
-#  Job Retention = 6 months            # six months
-#  AutoPrune = yes                     # Prune expired Jobs/Files
-#}
-
-
-# Definition of file storage device
-Storage {
-  Name = File
-# Do not use "localhost" here
-  Address = @storage_address@                # N.B. Use a fully qualified name here
-  SDPort = @storage_port@
-  Password = "@storage_password@"
-  Device = FileStorage
-  Media Type = File
-}
-
-
-
-# Definition of DDS tape storage device
-#Storage {
-#  Name = DDS-4    
-#  Do not use "localhost" here
-#  Address = @storage_address@                # N.B. Use a fully qualified name here
-#  SDPort = @storage_port@
-#  Password = "@storage_password@"          # password for Storage daemon
-#  Device = DDS-4                      # must be same as Device in Storage daemon
-#  Media Type = DDS-4                  # must be same as MediaType in Storage daemon
-#  Autochanger = yes                   # enable for autochanger device
-#}
-
-# Definition of 8mm tape storage device
-#Storage {
-#  Name = "8mmDrive"
-#  Do not use "localhost" here
-#  Address = @storage_address@                # N.B. Use a fully qualified name here
-#  SDPort = @storage_port@
-#  Password = "@storage_password@"
-#  Device = "Exabyte 8mm"
-#  MediaType = "8mm"
-#}
-
-
-# Generic catalog service
-Catalog {
-  Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
-}
-
-# Reasonable message delivery -- send most everything to email address
-#  and to the console
-Messages {
-  Name = Standard
-#
-# NOTE! If you send to two email or more email addresses, you will need
-#  to replace the %r in the from field (-f part) with a single valid
-#  email address in both the mailcommand and the operatorcommand.
-#
-  mailcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
-  mail = @job_email@ = all, !skipped            
-  operator = @job_email@ = mount
-  console = all, !skipped, !saved
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if they scroll off the console.
-#
-  append = "@working_dir@\\log" = all, !skipped
-}
-
-
-#
-# Message delivery for daemon messages (no job).
-Messages {
-  Name = Daemon
-  mailcommand = "\"@bin_dir@\\bsmtp\" -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = @job_email@ = all, !skipped            
-  console = all, !skipped, !saved
-  append = "@working_dir@\\log" = all, !skipped
-}
-
-
-
-# Default pool definition
-Pool {
-  Name = Default
-  Pool Type = Backup
-  Recycle = yes                       # Bacula can automatically recycle Volumes
-  AutoPrune = yes                     # Prune expired volumes
-  Volume Retention = 365 days         # one year
-}
-
-# Scratch pool definition
-Pool {
-  Name = Scratch
-  Pool Type = Backup
-}
-
-#
-# Restricted console used by tray-monitor to get the status of the director
-#
-Console {
-  Name = @monitor_name@
-  Password = "@monitor_password@"
-  CommandACL = status, .status
-}
diff --git a/bacula/src/win32/newinstaller/bacula-fd.conf.in b/bacula/src/win32/newinstaller/bacula-fd.conf.in
deleted file mode 100644
index 5d4c7f98a0..0000000000
--- a/bacula/src/win32/newinstaller/bacula-fd.conf.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Default  Bacula File Daemon Configuration file
-#
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
-#
-# There is not much to change here except perhaps the
-# File daemon Name
-#
-
-#
-# "Global" File daemon configuration specifications
-#
-FileDaemon {                            # this is me
-  Name = @client_name@
-  FDport = @client_port@                # where we listen for the director
-  WorkingDirectory = "@working_dir@"
-  Pid Directory = "@working_dir@"
-# Plugin Directory = "@fdplugins_dir@"
-  Maximum Concurrent Jobs = @client_maxjobs@
-}
-
-#
-# List Directors who are permitted to contact this File daemon
-#
-Director {
-  Name = @director_name@
-  Password = "@client_password@"
-}
-
-#
-# Restricted Director, used by tray-monitor to get the
-#   status of the file daemon
-#
-Director {
-  Name = @monitor_name@
-  Password = "@monitor_password@"
-  Monitor = yes
-}
-
-# Send all messages except skipped files back to Director
-Messages {
-  Name = Standard
-  director = @director_name@ = all, !skipped, !restored
-}
diff --git a/bacula/src/win32/newinstaller/bacula-logo.bmp b/bacula/src/win32/newinstaller/bacula-logo.bmp
deleted file mode 100644
index 9a9cf97099..0000000000
Binary files a/bacula/src/win32/newinstaller/bacula-logo.bmp and /dev/null differ
diff --git a/bacula/src/win32/newinstaller/bacula-sd.conf.in b/bacula/src/win32/newinstaller/bacula-sd.conf.in
deleted file mode 100644
index 9e662129c1..0000000000
--- a/bacula/src/win32/newinstaller/bacula-sd.conf.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# Default Bacula Storage Daemon Configuration file
-#
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ @DISTVER@
-#
-# You may need to change the name of your tape drive
-#   on the "Archive Device" directive in the Device
-#   resource.  If you change the Name and/or the 
-#   "Media Type" in the Device resource, please ensure
-#   that bacula-dir.conf has corresponding changes.
-#
-
-Storage {                             # definition of myself
-  Name = @storage_name@
-  SDPort = @storage_port@                  # Director's port      
-  WorkingDirectory = "@working_dir@"
-  Pid Directory = "@working_dir@"
-  Maximum Concurrent Jobs = @storage_maxjobs@
-}
-
-#
-# List Directors who are permitted to contact Storage daemon
-#
-Director {
-  Name = @director_name@
-  Password = "@storage_password@"
-}
-
-#
-# Restricted Director, used by tray-monitor to get the
-#   status of the storage daemon
-#
-Director {
-  Name = @monitor_name@
-  Password = "@monitor_password@"
-  Monitor = yes
-}
-
-#
-# Devices supported by this Storage daemon
-# To connect, the Director's bacula-dir.conf must have the
-#  same Name and MediaType. 
-#
-
-Device {
-  Name = FileStorage
-  Media Type = File
-  Archive Device = "C:\\Tmp"
-  LabelMedia = yes                   # lets Bacula label unlabeled media
-  Random Access = Yes
-  AutomaticMount = yes               # when device opened, read it
-  RemovableMedia = no
-  AlwaysOpen = no
-}
-
-#
-# An autochanger device with two drives
-#
-#Autochanger {
-#  Name = Autochanger
-#  Device = Drive-1
-#  Device = Drive-2
-#  Changer Command = "mtx-changer %c %o %S %a %d"
-#  Changer Device = Changer0
-#}
-
-#Device {
-#  Name = Drive-1                      #
-#  Drive Index = 0
-#  Media Type = DLT-8000
-#  Device Type = Tape
-#  Archive Device = Tape0
-#  AutomaticMount = yes               # when device opened, read it
-#  AlwaysOpen = yes
-#  RemovableMedia = yes
-#  RandomAccess = no
-#  AutoChanger = yes
-#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"
-#}
-
-#Device {
-#  Name = Drive-2                      #
-#  Drive Index = 1
-#  Media Type = DLT-8000
-#  Device Type = Tape
-#  Archive Device = Tape1
-#  AutomaticMount = yes               # when device opened, read it
-#  AlwaysOpen = yes
-#  RemovableMedia = yes
-#  RandomAccess = no
-#  AutoChanger = yes
-#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"
-#}
-
-#
-#Device {
-#  Name = DDS-4                        # 
-#  Media Type = DDS-4
-#  Device Type = Tape
-#  Archive Device = Tape0
-#  AutomaticMount = yes               # when device opened, read it
-#  AlwaysOpen = yes
-#  RemovableMedia = yes
-#  RandomAccess = no
-#  Alert Command = "tapeinfo -f %c | findstr TapeAlert"
-#}
-
-# 
-# Send all messages to the Director, 
-# mount messages also are sent to the email address
-#
-Messages {
-  Name = Standard
-  director = @director_name@ = all
-}
diff --git a/bacula/src/win32/newinstaller/bconsole.conf.in b/bacula/src/win32/newinstaller/bconsole.conf.in
deleted file mode 100644
index 4f60389ea4..0000000000
--- a/bacula/src/win32/newinstaller/bconsole.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = @director_name@
-  DIRport = @director_port@
-  address = @director_address@
-  Password = "@director_password@"
-}
diff --git a/bacula/src/win32/newinstaller/build-installer.cmd b/bacula/src/win32/newinstaller/build-installer.cmd
deleted file mode 100644
index 5d77a9f89f..0000000000
--- a/bacula/src/win32/newinstaller/build-installer.cmd
+++ /dev/null
@@ -1,70 +0,0 @@
-@ECHO OFF
-SETLOCAL
-
-SET CWD=%CD%
-CD %1..\..\..
-SET TOP_DIR=%CD%
-CD %CWD%
-SET DEPKG_DIR=%TOP_DIR%\depkgs-msvc
-SET DOCS_DIR=%TOP_DIR%\docs\manual
-
-SET BACULA_DLLS=bacula.dll cats_mysql.dll cats_postgresql.dll cats_sqlite3.dll
-SET BACULA_EXES=bacula-dir.exe bacula-fd.exe bacula-sd.exe bconsole.exe wx-console.exe
-SET BACULA_TOOLS=bcopy.exe bextract.exe bls.exe bscan.exe bsleep.exe bsmtp.exe btape.exe dbcheck.exe scsilist.exe
-
-SET DEP_DLLS=libeay32.dll pthreadVCE.dll ssleay32.dll zlib1.dll zlib1.dll.manifest wxbase28_vc_bacula.dll wxmsw28_core_vc_bacula.dll libmysql.dll libpq.dll comerr32.dll libintl-2.dll libiconv-2.dll krb5_32.dll
-SET DEP_EXES=openssl.exe loaderinfo.exe mt.exe mtx.exe scsitape.exe sed.exe tapeinfo.exe sqlite3.exe sqlite3.exe.manifest expr64.exe snooze.exe mkisofs.exe growisofs.exe dvd-ram-control.exe dvd+rw-booktype.exe dvd+rw-format.exe dvd+rw-mediainfo.exe
-
-SET SCRIPTS=mtx-changer.cmd disk-changer.cmd dvd-handler.cmd
-
-SET CATS_MYSQL_CMD=create_mysql_database.cmd drop_mysql_database.cmd make_mysql_tables.cmd drop_mysql_tables.cmd grant_mysql_privileges.cmd
-SET CATS_MYSQL_SQL=make_mysql_tables.sql drop_mysql_tables.sql grant_mysql_privileges.sql
-SET CATS_PGSQL_CMD=create_postgresql_database.cmd drop_postgresql_database.cmd make_postgresql_tables.cmd drop_postgresql_tables.cmd grant_postgresql_privileges.cmd
-SET CATS_PGSQL_SQL=create_postgresql_database.sql make_postgresql_tables.sql drop_postgresql_tables.sql grant_postgresql_privileges.sql
-SET CATS_SQLITE_CMD=create_sqlite3_database.cmd drop_sqlite3_database.cmd make_sqlite3_tables.cmd drop_sqlite3_tables.cmd grant_sqlite3_privileges.cmd
-SET CATS_SQLITE_SQL=make_sqlite3_tables.sql
-SET CATS_CATALOG=make_mysql_catalog_backup.cmd make_postgresql_catalog_backup.cmd make_sqlite3_catalog_backup.cmd delete_catalog_backup.cmd
-SET DIRD_FILES=query.sql
-SET SSL_FILES=openssl.cnf
-
-SET DOC_PDF_FILES=%DOCS_DIR%\bacula.pdf %DOCS_DIR%\bacula\*.html %DOCS_DIR%\bacula\*.png %DOCS_DIR%\bacula\*.css
-SET DOC_HTML_FILES=%DOCS_DIR%\bacula\*.html %DOCS_DIR%\bacula\*.png %DOCS_DIR%\bacula\*.css
-
-FOR %%i in ( %BACULA_DLLS% )     DO XCOPY %1%2\%%i %1installer\%2\ /y
-FOR %%i in ( %BACULA_EXES% )     DO XCOPY %1%2\%%i %1installer\%2\ /y
-FOR %%i in ( %BACULA_TOOLS% )    DO XCOPY %1%2\%%i %1installer\%2\ /y
-
-FOR %%i in ( %DEP_DLLS% )        DO XCOPY %DEPKG_DIR%\bin\%%i %1installer\%2\ /y
-FOR %%i in ( %DEP_EXES% )        DO XCOPY %DEPKG_DIR%\bin\%%i %1installer\%2\ /y
-
-FOR %%i in ( %SCRIPTS% )         DO XCOPY %1scripts\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_MYSQL_CMD% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_MYSQL_SQL% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_PGSQL_CMD% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_PGSQL_SQL% )  DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_SQLITE_CMD% ) DO XCOPY %1cats\%%i %1installer\%2\ /y
-FOR %%i in ( %CATS_SQLITE_SQL% ) DO XCOPY %1cats\%%i %1installer\%2\ /y
-
-FOR %%i in ( %CATS_CATALOG% )    DO XCOPY %1cats\%%i %1installer\%2\ /y
-
-FOR %%i in ( %DIRD_FILES% )      DO XCOPY %1..\dird\%%i %1installer\%2\ /y
-FOR %%i in ( %SSL_FILES% )       DO XCOPY %DEPKG_DIR%\%%i %1installer\%2\ /y
-
-FOR %%i in ( %DOC_PDF_FILES% )   DO XCOPY %%i %1installer\%2\manual\ /y
-
-FOR %%i in ( %DOC_HTML_FILES% )  DO XCOPY %%i %1installer\%2\manual\bacula\ /y
-
-XCOPY %4\x86\Microsoft.VC80.CRT\msvcm80.dll %1installer\%2\ /y
-XCOPY %4\x86\Microsoft.VC80.CRT\msvcp80.dll %1installer\%2\ /y
-XCOPY %4\x86\Microsoft.VC80.CRT\msvcr80.dll %1installer\%2\ /y
-XCOPY %4\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcm80d.dll %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcp80d.dll %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcr80d.dll %1installer\%2\ /y
-XCOPY %4\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\Microsoft.VC80.DebugCRT.manifest %1installer\%2\ /y
-
-PATH %DEPKG_DIR%\nsis;%DEPKG_DIR%\tools;%PATH%
-
-FOR /F %%i IN ( 'sed -ne "s/.*[ \t]VERSION[ \t][ \t]*\x22\(.*\)\x22/\1/p" ^< ..\..\version.h' ) DO @SET VERSION=%%i 
-makensis /V3 /DVERSION=%VERSION% /DSRC_DIR=%1installer\%2 /DOUT_DIR=%1%2 /DBUILD_TOOLS=%3 winbacula.nsi
-EXIT /B %ERRORLEVEL%
diff --git a/bacula/src/win32/newinstaller/bwx-console.conf.in b/bacula/src/win32/newinstaller/bwx-console.conf.in
deleted file mode 100644
index 4f60389ea4..0000000000
--- a/bacula/src/win32/newinstaller/bwx-console.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
-  Name = @director_name@
-  DIRport = @director_port@
-  address = @director_address@
-  Password = "@director_password@"
-}
diff --git a/bacula/src/win32/newinstaller/client.conf.in b/bacula/src/win32/newinstaller/client.conf.in
deleted file mode 100644
index 5f2abe47e4..0000000000
--- a/bacula/src/win32/newinstaller/client.conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
-# Client (File Services) to backup
-Client {
-  Name = @client_name@
-  Address = @client_address@
-  FDPort = @client_port@
-  Catalog = MyCatalog
-  Password = "@client_password@"      # password for FileDaemon
-  File Retention = 30 days            # 30 days
-  Job Retention = 6 months            # six months
-  AutoPrune = yes                     # Prune expired Jobs/Files
-}
diff --git a/bacula/src/win32/newinstaller/installer.vcproj b/bacula/src/win32/newinstaller/installer.vcproj
deleted file mode 100644
index 18ddc6e037..0000000000
--- a/bacula/src/win32/newinstaller/installer.vcproj
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="installer"
-	ProjectGUID="{6D1B0964-FB32-4916-A61C-49D7F715EAD8}"
-	RootNamespace="installer"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="0"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-				ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8_DEBUG &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-				CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"
-				Output=""
-				PreprocessorDefinitions="VERSION=$(VERSION);DOC_DIR=..\..\..\..\docs;BUILD_TOOLS=VC8_DEBUG;VC_REDIST_DIR=$(VCInstallDir)redist\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT;DEPKGS_BIN=..\..\..\..\depkgs-msvc\bin;BACULA_BIN=..\$(ConfigurationName);CATS_DIR=..\cats;SCRIPT_DIR=..\scripts"
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="0"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-				ReBuildCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe&#x0D;&#x0A;build-installer $(SolutionDir) $(ConfigurationName) VC8 &quot;$(VCInstallDir)redist&quot;&#x0D;&#x0A;"
-				CleanCommandLine="del $(SolutionDir)$(ConfigurationName)\winbacula-*.exe"
-				Output=""
-				PreprocessorDefinitions=""
-				IncludeSearchPath=""
-				ForcedIncludes=""
-				AssemblySearchPath=""
-				ForcedUsingAssemblies=""
-				CompileAsManaged=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\Dialogs.rc"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\bacula-dir.conf.in"
-			>
-		</File>
-		<File
-			RelativePath=".\bacula-fd.conf.in"
-			>
-		</File>
-		<File
-			RelativePath=".\bacula-sd.conf.in"
-			>
-		</File>
-		<File
-			RelativePath=".\bconsole.conf.in"
-			>
-		</File>
-		<File
-			RelativePath=".\build-installer.cmd"
-			>
-		</File>
-		<File
-			RelativePath=".\client.conf.in"
-			>
-		</File>
-		<File
-			RelativePath=".\ConfigPage1.nsh"
-			>
-		</File>
-		<File
-			RelativePath=".\ConfigPage2.nsh"
-			>
-		</File>
-		<File
-			RelativePath=".\DumpLog.nsh"
-			>
-		</File>
-		<File
-			RelativePath=".\InstallType.ini"
-			>
-		</File>
-		<File
-			RelativePath=".\InstallType.nsh"
-			>
-		</File>
-		<File
-			RelativePath=".\Readme.txt"
-			>
-		</File>
-		<File
-			RelativePath=".\storage.conf.in"
-			>
-		</File>
-		<File
-			RelativePath=".\winbacula.nsi"
-			>
-		</File>
-		<File
-			RelativePath=".\WriteTemplates.ini"
-			>
-		</File>
-		<File
-			RelativePath=".\wx-console.conf.in"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/bacula/src/win32/newinstaller/storage.conf.in b/bacula/src/win32/newinstaller/storage.conf.in
deleted file mode 100644
index 5928815c5c..0000000000
--- a/bacula/src/win32/newinstaller/storage.conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# Definition of file storage device
-Storage {
-  Name = File
-# Do not use "localhost" here    
-  Address = @storage_address@                # N.B. Use a fully qualified name here
-  SDPort = @storage_port@
-  Password = "@storage_password@"
-  Device = FileStorage
-  Media Type = File
-}
diff --git a/bacula/src/win32/newinstaller/winbacula.nsi b/bacula/src/win32/newinstaller/winbacula.nsi
deleted file mode 100644
index 90e7ca9c0a..0000000000
--- a/bacula/src/win32/newinstaller/winbacula.nsi
+++ /dev/null
@@ -1,994 +0,0 @@
-; winbsclient.nsi
-;
-; Began as a version written by Michel Meyers (michel@tcnnet.dyndns.org)
-;
-; Adapted by Kern Sibbald for native Win32 Bacula
-;    added a number of elements from Christopher Hull's installer
-;
-; D. Scott Barninger Nov 13 2004
-; added configuration editing for bconsole.conf and bwx-console.conf
-; better explanation in dialog boxes for editing config files
-; added Start Menu items
-; fix uninstall of config files to do all not just bacula-fd.conf
-;
-; D. Scott Barninger Dec 05 2004
-; added specification of default permissions for bacula-fd.conf
-;   - thanks to Jamie Ffolliott for pointing me at cacls
-; added removal of working-dir files if user selects to remove config
-; uninstall is now 100% clean
-;
-; D. Scott Barninger Apr 17 2005
-; 1.36.3 release docs update
-; add pdf manual and menu shortcut
-;
-; Robert Nelson May 15 2006
-; Added server installs and implemented Microsoft install locations
-; Use LogicLib.nsh
-; Added Bacula-SD and Bacula-DIR
-; Replaced ParameterGiven with standard GetOptions
-;
-; Kern Sibbald October 2008
-; Remove server installs
-; Install into single bacula directory
-;  (i.e. undo a large part of what Robert Nelson did)
-;
-; Version $Id: winbacula.nsi 7074 2008-05-31 18:43:21Z kerns $
-;
-; Command line options:
-;
-; /service    - 
-; /start
-;
-; netsh firewall add portopening protocol=tcp port=9102 name="Bacula-FD"
-
-
-!define PRODUCT "Bacula"
-
-;
-; Include the Modern UI
-;
-
-!include "MUI.nsh"
-!include "LogicLib.nsh"
-!include "FileFunc.nsh"
-!include "Sections.nsh"
-!include "StrFunc.nsh"
-!include "WinMessages.nsh"
-;
-; Basics
-;
-Name "Bacula"
-OutFile "${OUT_DIR}\winbaculasystems-${VERSION}.exe"
-SetCompressor lzma
-InstallDir "$PROGRAMFILES\bacula"
-
-InstallDirRegKey HKLM "Software\Bacula" "InstallLocation"
-
-InstType "Client"
-
-!insertmacro GetParent
-
-${StrCase}
-${StrRep}
-${StrTok}
-${StrTrimNewLines}
-
-;
-; Pull in pages
-;
-
-!define      MUI_COMPONENTSPAGE_SMALLDESC
-
-!define      MUI_HEADERIMAGE
-!define      MUI_BGCOLOR                739AB9
-!define      MUI_HEADERIMAGE_BITMAP     "bacula-logo.bmp"
-
-!InsertMacro MUI_PAGE_WELCOME
-!InsertMacro MUI_PAGE_LICENSE "..\..\..\LICENSE"
-Page custom EnterInstallType
-!define      MUI_PAGE_CUSTOMFUNCTION_SHOW PageComponentsShow
-!InsertMacro MUI_PAGE_COMPONENTS
-!define      MUI_PAGE_CUSTOMFUNCTION_PRE PageDirectoryPre
-!InsertMacro MUI_PAGE_DIRECTORY
-Page custom EnterConfigPage1 LeaveConfigPage1
-Page custom EnterConfigPage2 LeaveConfigPage2
-!Define      MUI_PAGE_CUSTOMFUNCTION_LEAVE LeaveInstallPage
-!InsertMacro MUI_PAGE_INSTFILES
-Page custom EnterWriteTemplates
-!Define      MUI_FINISHPAGE_SHOWREADME $INSTDIR\Readme.txt
-!InsertMacro MUI_PAGE_FINISH
-
-!InsertMacro MUI_UNPAGE_WELCOME
-!InsertMacro MUI_UNPAGE_CONFIRM
-!InsertMacro MUI_UNPAGE_INSTFILES
-!InsertMacro MUI_UNPAGE_FINISH
-
-!define      MUI_ABORTWARNING
-
-!InsertMacro MUI_LANGUAGE "English"
-
-!InsertMacro GetParameters
-!InsertMacro GetOptions
-
-DirText "Setup will install Bacula Systems ${VERSION} to the directory specified below. To install in a different folder, click Browse and select another folder."
-
-!InsertMacro MUI_RESERVEFILE_INSTALLOPTIONS
-;
-; Global Variables
-;
-Var OptService
-Var OptStart
-Var OptSilent
-
-Var CommonFilesDone
-
-Var OsIsNT
-
-Var HostName
-
-Var ConfigClientName
-Var ConfigClientPort
-Var ConfigClientMaxJobs
-Var ConfigClientPassword
-Var ConfigClientInstallService
-Var ConfigClientStartService
-
-Var ConfigStorageName
-Var ConfigStoragePort
-Var ConfigStorageMaxJobs
-Var ConfigStoragePassword
-Var ConfigStorageInstallService
-Var ConfigStorageStartService
-
-Var ConfigDirectorName
-Var ConfigDirectorPort
-Var ConfigDirectorMaxJobs
-Var ConfigDirectorPassword
-Var ConfigDirectorAddress
-Var ConfigDirectorMailServer
-Var ConfigDirectorMailAddress
-Var ConfigDirectorDB
-Var ConfigDirectorInstallService
-Var ConfigDirectorStartService
-
-Var ConfigMonitorName
-Var ConfigMonitorPassword
-
-Var LocalDirectorPassword
-Var LocalHostAddress
-
-Var MySQLPath
-Var MySQLVersion
-Var PostgreSQLPath
-Var PostgreSQLVersion
-
-Var AutomaticInstall
-Var InstallType
-
-!define NewInstall      0
-!define UpgradeInstall  1
-!define MigrateInstall  2
-
-Var OldInstallDir
-Var PreviousComponents
-Var NewComponents
-
-; Bit 0 = File Service
-;     1 = Storage Service
-;     2 = Director Service
-;     3 = Command Console
-;     4 = Graphical Console
-;     5 = Documentation (PDF)
-;     6 = Documentation (HTML)
-
-!define ComponentFile                   1
-!define ComponentStorage                2
-!define ComponentDirector               4
-!define ComponentTextConsole            8
-!define ComponentGUIConsole             16
-!define ComponentPDFDocs                32
-!define ComponentHTMLDocs               64
-
-!define ComponentsRequiringUserConfig           31
-!define ComponentsFileAndStorage                3
-!define ComponentsFileAndStorageAndDirector     7
-!define ComponentsDirectorAndTextGuiConsoles    28
-!define ComponentsTextAndGuiConsoles            24
-
-Var HDLG
-Var HCTL
-
-Function .onInit
-  Push $R0
-  Push $R1
-
-  ; Process Command Line Options
-  StrCpy $OptService 1
-  StrCpy $OptStart 1
-  StrCpy $OptSilent 0
-  StrCpy $CommonFilesDone 0
-  StrCpy $OsIsNT 0
-  StrCpy $AutomaticInstall 0
-  StrCpy $InstallType ${NewInstall}
-  StrCpy $OldInstallDir ""
-  StrCpy $PreviousComponents 0
-  StrCpy $NewComponents 0
-  StrCpy $MySQLPath ""
-  StrCpy $MySQLVersion ""
-  StrCpy $PostgreSQLPath ""
-  StrCpy $PostgreSQLVersion ""
-  StrCpy $LocalDirectorPassword ""
-
-  ${GetParameters} $R0
-
-  ClearErrors
-  ${GetOptions} $R0 "/noservice" $R1
-  IfErrors +2
-    StrCpy $OptService 0
-
-  ClearErrors
-  ${GetOptions} $R0 "/nostart" $R1
-  IfErrors +2
-    StrCpy $OptStart 0
-
-  IfSilent 0 +2
-    StrCpy $OptSilent 1
-
-  ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  ${If} $R0 != ""
-    StrCpy $OsIsNT 1
-  ${EndIf}
-
-  Call GetComputerName
-  Pop $HostName
-
-  Call GetHostName
-  Pop $LocalHostAddress
-
-  Call GetUserName
-
-  ; Configuration Defaults
-
-  StrCpy $ConfigClientName               "$HostName-fd"
-  StrCpy $ConfigClientPort               9102
-  StrCpy $ConfigClientMaxJobs            2
-  ;StrCpy $ConfigClientPassword
-  StrCpy $ConfigClientInstallService     "$OptService"
-  StrCpy $ConfigClientStartService       "$OptStart"
-
-
-  StrCpy $ConfigMonitorName              "$HostName-mon"
-  ;StrCpy $ConfigMonitorPassword
-
-  InitPluginsDir
-  File "/oname=$PLUGINSDIR\openssl.exe"  "${SRC_DIR}\openssl.exe"
-  File "/oname=$PLUGINSDIR\libeay32.dll" "${SRC_DIR}\libeay32.dll"
-  File "/oname=$PLUGINSDIR\ssleay32.dll" "${SRC_DIR}\ssleay32.dll"
-  File "/oname=$PLUGINSDIR\sed.exe"      "${SRC_DIR}\sed.exe"
-
-  !InsertMacro MUI_INSTALLOPTIONS_EXTRACT "InstallType.ini"
-  !InsertMacro MUI_INSTALLOPTIONS_EXTRACT "WriteTemplates.ini"
-
-  SetPluginUnload alwaysoff
-
-  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
-  pop $R0
-  ${If} $R0 = 0
-   FileOpen $R1 "$PLUGINSDIR\pw.txt" r
-   IfErrors +4
-     FileRead $R1 $R0
-     ${StrTrimNewLines} $ConfigClientPassword $R0
-     FileClose $R1
-  ${EndIf}
-
-  SetPluginUnload manual
-
-  nsExec::Exec '"$PLUGINSDIR\openssl.exe" rand -base64 -out $PLUGINSDIR\pw.txt 33'
-  pop $R0
-  ${If} $R0 = 0
-   FileOpen $R1 "$PLUGINSDIR\pw.txt" r
-   IfErrors +4
-     FileRead $R1 $R0
-     ${StrTrimNewLines} $ConfigMonitorPassword $R0
-     FileClose $R1
-  ${EndIf}
-
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-Function .onSelChange
-  Call UpdateComponentUI
-FunctionEnd
-
-Function InstallCommonFiles
-  ${If} $CommonFilesDone = 0
-    SetOutPath "$INSTDIR"
-    File "Readme.txt"
-
-    SetOutPath "$INSTDIR"
-!if "${BUILD_TOOLS}" == "VC8"
-    File "${SRC_DIR}\msvcm80.dll"
-    File "${SRC_DIR}\msvcp80.dll"
-    File "${SRC_DIR}\msvcr80.dll"
-    File "${SRC_DIR}\Microsoft.VC80.CRT.manifest"
-    File "${SRC_DIR}\pthreadVCE.dll"
-!endif
-!if "${BUILD_TOOLS}" == "VC8_DEBUG"
-    File "${SRC_DIR}\msvcm80.dll"
-    File "${SRC_DIR}\msvcp80.dll"
-    File "${SRC_DIR}\msvcr80.dll"
-    File "${SRC_DIR}\Microsoft.VC80.CRT.manifest"
-    File "${SRC_DIR}\msvcm80d.dll"
-    File "${SRC_DIR}\msvcp80d.dll"
-    File "${SRC_DIR}\msvcr80d.dll"
-    File "${SRC_DIR}\Microsoft.VC80.DebugCRT.manifest"
-    File "${SRC_DIR}\pthreadVCE.dll"
-!endif
-!if "${BUILD_TOOLS}" == "MinGW"
-    File "${SRC_DIR}\mingwm10.dll"
-    File "${SRC_DIR}\pthreadGCE.dll"
-!endif
-    File "${SRC_DIR}\libeay32.dll"
-    File "${SRC_DIR}\ssleay32.dll"
-    File "${SRC_DIR}\zlib1.dll"
-!if "${BUILD_TOOLS}" == "VC8"
-    File "${SRC_DIR}\zlib1.dll.manifest"
-!endif
-!If "${BUILD_TOOLS}" == "VC8_DEBUG"
-    File "${SRC_DIR}\zlib1.dll.manifest"
-!endif
-    File "/oname=$INSTDIR\openssl.cnf" "${SRC_DIR}\openssl.cnf"
-    File "${SRC_DIR}\openssl.exe"
-    File "${SRC_DIR}\bsleep.exe"
-    File "${SRC_DIR}\bsmtp.exe"
-    File "${SRC_DIR}\bacula.dll"
-    File "${SRC_DIR}\expr64.exe"
-    File "${SRC_DIR}\snooze.exe"
-
-    CreateShortCut "$SMPROGRAMS\Bacula\Documentation\View Readme.lnk" "write.exe" '"$INSTDIR\Readme.txt"'
-
-    StrCpy $CommonFilesDone 1
-  ${EndIf}
-FunctionEnd
-
-Section "-Initialize"
-
-  WriteRegStr   HKLM Software\Bacula InstallLocation "$INSTDIR"
-
-  Call GetSelectedComponents
-  Pop $R2
-  WriteRegDWORD HKLM Software\Bacula Components $R2
-
-  ; remove start menu items
-  SetShellVarContext all
-
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\Configuration\*"
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\Documentation\*"
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\*"
-  RMDir "$SMPROGRAMS\Bacula\Configuration"
-  RMDir "$SMPROGRAMS\Bacula\Documentation"
-  RMDir "$SMPROGRAMS\Bacula"
-  CreateDirectory "$SMPROGRAMS\Bacula"
-  CreateDirectory "$SMPROGRAMS\Bacula\Configuration"
-  CreateDirectory "$SMPROGRAMS\Bacula\Documentation"
-
-  CreateDirectory "$INSTDIR"
-  CreateDirectory "$INSTDIR\working"
-
-  SetOutPath "$INSTDIR"
-  File "..\..\..\LICENSE"
-  Delete /REBOOTOK "$INSTDIR\License.txt"
-
-  FileOpen $R1 $PLUGINSDIR\config.sed w
-  FileWrite $R1 "s;@VERSION@;${VERSION};g$\r$\n"
-  FileWrite $R1 "s;@DATE@;${__DATE__};g$\r$\n"
-  FileWrite $R1 "s;@DISTNAME@;Windows;g$\r$\n"
-
-!If "$BUILD_TOOLS" == "MinGW"
-  StrCpy $R2 "MinGW32"
-!Else
-  StrCpy $R2 "MVS"
-!EndIf
-
-  Call GetHostName
-  Exch $R3
-  Pop $R3
-
-  FileWrite $R1 "s;@DISTVER@;$R2;g$\r$\n"
-
-  ${StrRep} $R2 "$INSTDIR\working" "\" "\\\\"
-  FileWrite $R1 's;@working_dir@;$R2;g$\r$\n'
-  ${StrRep} $R2 "$INSTDIR\working" "\" "\\"
-  FileWrite $R1 's;@working_dir_cmd@;$R2;g$\r$\n'
-
-  ${StrRep} $R2 "$INSTDIR" "\" "\\\\"
-  FileWrite $R1 's;@bin_dir@;$R2;g$\r$\n'
-  ${StrRep} $R2 "$INSTDIR" "\" "\\"
-  FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'
-
-  ${StrRep} $R2 "$INSTDIR\plugins" "\" "\\\\"
-  FileWrite $R1 's;@fdplugins_dir@;$R2;g$\r$\n'
-
-  ${StrRep} $R2 "$INSTDIR" "\" "/"
-  FileWrite $R1 "s;@BUILD_DIR@;$R2;g$\r$\n"
-
-  FileWrite $R1 "s;@client_address@;$LocalHostAddress;g$\r$\n"
-
-  ${If} "$ConfigClientName" != ""
-    FileWrite $R1 "s;@client_name@;$ConfigClientName;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigClientPort" != ""
-    FileWrite $R1 "s;@client_port@;$ConfigClientPort;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigClientMaxJobs" != ""
-    FileWrite $R1 "s;@client_maxjobs@;$ConfigClientMaxJobs;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigClientPassword" != ""
-    FileWrite $R1 "s;@client_password@;$ConfigClientPassword;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigMonitorName" != ""
-    FileWrite $R1 "s;@monitor_name@;$ConfigMonitorName;g$\r$\n"
-  ${EndIf}
-  ${If} "$ConfigMonitorPassword" != ""
-    FileWrite $R1 "s;@monitor_password@;$ConfigMonitorPassword;g$\r$\n"
-  ${EndIf}
-
-  FileClose $R1
-
-
-  ${If} ${FileExists} "$OldInstallDir\bin\bacula-fd.exe"
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-fd.exe" /kill'     ; Shutdown any bacula that could be running
-    Sleep 3000
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-fd.exe" /remove'   ; Remove existing service
-  ${EndIf}
-
-  ${If} ${FileExists} "$OldInstallDir\bin\bacula-sd.exe"
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-sd.exe" /kill'     ; Shutdown any bacula that could be running
-    Sleep 3000
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-sd.exe" /remove'   ; Remove existing service
-  ${EndIf}
-
-  ${If} ${FileExists} "$OldInstallDir\bin\bacula-dir.exe"
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-dir.exe" /kill'     ; Shutdown any bacula that could be running
-    Sleep 3000
-    nsExec::ExecToLog '"$OldInstallDir\bin\bacula-dir.exe" /remove'   ; Remove existing service
-  ${EndIf}
-
-SectionEnd
-
-SectionGroup "Client" SecGroupClient
-
-Section "File Service" SecFileDaemon
-  SectionIn 1 2 3
-
-  SetOutPath "$INSTDIR\plugins"
-  File "${SRC_DIR}\exchange-fd.dll"
-
-  SetOutPath "$INSTDIR"
-
-  File "${SRC_DIR}\bacula-fd.exe"
-
-    File "/oname=$PLUGINSDIR\bacula-fd.conf" "bacula-fd.conf.in"
-
-    StrCpy $0 "$INSTDIR"
-    StrCpy $1 bacula-fd.conf
-    Call ConfigEditAndCopy
-
-  StrCpy $0 bacula-fd
-  StrCpy $1 "File Service"
-  StrCpy $2 $ConfigClientInstallService
-  StrCpy $3 $ConfigClientStartService
-
-  Call InstallDaemon
-
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Client Configuration.lnk" "write.exe" '"$INSTDIR\bacula-fd.conf"'
-SectionEnd
-
-SectionGroupEnd
-
-
-SectionGroup "Consoles" SecGroupConsoles
-
-Section "Command Console" SecConsole
-  SectionIn 1 2 3
-
-  SetOutPath "$INSTDIR"
-
-  File "${SRC_DIR}\bconsole.exe"
-  Call InstallCommonFiles
-
-  CreateShortCut "$SMPROGRAMS\Bacula\bconsole.lnk" "$INSTDIR\bconsole.exe" '-c "$INSTDIR\bconsole.conf"' "$INSTDIR\bconsole.exe" 0
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Command Console Configuration.lnk" "write.exe" '"$INSTDIR\bconsole.conf"'
-
-SectionEnd
-
-Section "Graphical Console" SecWxConsole
-  SectionIn 1 2 3
-  
-  SetOutPath "$INSTDIR"
-
-  Call InstallCommonFiles
-!if "${BUILD_TOOLS}" == "VC8"
-  File "${SRC_DIR}\wxbase28_vc_bacula.dll"
-  File "${SRC_DIR}\wxmsw28_core_vc_bacula.dll"
-!endif
-!If "${BUILD_TOOLS}" == "VC8_DEBUG"
-  File "${SRC_DIR}\wxbase28_vc_bacula.dll"
-  File "${SRC_DIR}\wxmsw28_core_vc_bacula.dll"
-!endif
-!if "${BUILD_TOOLS}" == "MinGW"
-  File "${SRC_DIR}\wxbase28_gcc_bacula.dll"
-  File "${SRC_DIR}\wxmsw28_core_gcc_bacula.dll"
-!endif
-
-  File "${SRC_DIR}\bwx-console.exe"
-
-    File "/oname=$PLUGINSDIR\bwx-console.conf" "bwx-console.conf.in"
-    StrCpy $0 "$INSTDIR"
-    StrCpy $1 bwx-console.conf
-    Call ConfigEditAndCopy
-
-  ; Create Start Menu entry
-  CreateShortCut "$SMPROGRAMS\Bacula\bwx-console.lnk" "$INSTDIR\bwx-console.exe" '-c "$INSTDIR\bwx-console.conf"' "$INSTDIR\bwx-console.exe" 0
-  CreateShortCut "$SMPROGRAMS\Bacula\Configuration\Edit Graphical Console Configuration.lnk" "write.exe" '"$INSTDIR\bwx-console.conf"'
-SectionEnd
-
-SectionGroupEnd
-
-SectionGroup "Documentation" SecGroupDocumentation
-
-Section "Documentation (Acrobat Format)" SecDocPdf
-  SectionIn 1 2 3
-
-  SetOutPath "$INSTDIR\doc"
-  CreateDirectory "$INSTDIR\doc"
-
-  File "${SRC_DIR}\manual\bacula.pdf"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual.lnk" '"$INSTDIR\doc\bacula.pdf"'
-SectionEnd
-
-Section "Documentation (HTML Format)" SecDocHtml
-  SectionIn 3
-
-  SetOutPath "$INSTDIR\doc"
-  CreateDirectory "$INSTDIR\doc"
-
-  File "${SRC_DIR}\manual\bacula\*.html"
-  File "${SRC_DIR}\manual\bacula\*.png"
-  File "${SRC_DIR}\manual\bacula\*.css"
-  CreateShortCut "$SMPROGRAMS\Bacula\Documentation\Manual (HTML).lnk" '"$INSTDIR\doc\index.html"'
-SectionEnd
-
-SectionGroupEnd
-
-Section "-Finish"
-  Push $R0
-
-  ${If} $OsIsNT = 1
-    nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$INSTDIR" /T /G SYSTEM:F Administrators:F'
-    nsExec::ExecToLog 'cmd.exe /C echo Y|cacls "$INSTDIR" /T /G SYSTEM:F Administrators:F'
-  ${EndIf}
-
-  ; Write the uninstall keys for Windows & create Start Menu entry
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayName" "Bacula"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "InstallLocation" "$INSTDIR"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "DisplayVersion" "${VERSION}"
-  ${StrTok} $R0 "${VERSION}" "." 0 0
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMajor" $R0
-  ${StrTok} $R0 "${VERSION}" "." 1 0
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "VersionMinor" $R0
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoModify" 1
-  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "NoRepair" 1
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLUpdateInfo" "http://sourceforge.net/project/showfiles.php?group_id=50727"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "URLInfoAbout" "http://www.bacula.org"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "HelpLink" "http://www.bacula.org/?page=support"
-  WriteRegStr   HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula" "UninstallString" '"$INSTDIR\uninstall.exe"'
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\Bacula\Uninstall Bacula.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-  Pop $R0
-SectionEnd
-
-; Extra Page descriptions
-
-LangString DESC_SecFileDaemon ${LANG_ENGLISH} "Install Bacula File Daemon on this system."
-LangString DESC_SecConsole ${LANG_ENGLISH} "Install command console program on this system."
-LangString DESC_SecWxConsole ${LANG_ENGLISH} "Install graphical console program on this system."
-LangString DESC_SecDocPdf ${LANG_ENGLISH} "Install documentation in Acrobat format on this system."
-LangString DESC_SecDocHtml ${LANG_ENGLISH} "Install documentation in HTML format on this system."
-
-LangString TITLE_ConfigPage1 ${LANG_ENGLISH} "Configuration"
-LangString SUBTITLE_ConfigPage1 ${LANG_ENGLISH} "Set installation configuration."
-
-LangString TITLE_ConfigPage2 ${LANG_ENGLISH} "Configuration (continued)"
-LangString SUBTITLE_ConfigPage2 ${LANG_ENGLISH} "Set installation configuration."
-
-LangString TITLE_InstallType ${LANG_ENGLISH} "Installation Type"
-LangString SUBTITLE_InstallType ${LANG_ENGLISH} "Choose installation type."
-
-LangString TITLE_WriteTemplates ${LANG_ENGLISH} "Create Templates"
-LangString SUBTITLE_WriteTemplates ${LANG_ENGLISH} "Create resource templates for inclusion in the Director's configuration file."
-
-!InsertMacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecFileDaemon} $(DESC_SecFileDaemon)
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecConsole} $(DESC_SecConsole)
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecWxConsole} $(DESC_SecWxConsole)
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocPdf} $(DESC_SecDocPdf)
-  !InsertMacro MUI_DESCRIPTION_TEXT ${SecDocHtml} $(DESC_SecDocHtml)
-!InsertMacro MUI_FUNCTION_DESCRIPTION_END
-
-; Uninstall section
-
-UninstallText "This will uninstall Bacula. Hit next to continue."
-
-Section "Uninstall"
-  ; Shutdown any baculum that could be running
-  nsExec::ExecToLog '"$INSTDIR\bacula-fd.exe" /kill'
-  Sleep 3000
-
-  ReadRegDWORD $R0 HKLM "Software\Bacula" "Service_Bacula-fd"
-  ${If} $R0 = 1
-    ; Remove bacula service
-    nsExec::ExecToLog '"$INSTDIR\bacula-fd.exe" /remove'
-    nsExec::ExecToLog '"$INSTDIR\plugins\exchange-fd.dll" /remove'
-  ${EndIf}
-  
-  ; remove registry keys
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Bacula"
-  DeleteRegKey HKLM "Software\Bacula"
-
-  ; remove start menu items
-  SetShellVarContext all
-  Delete /REBOOTOK "$SMPROGRAMS\Bacula\*"
-  RMDir "$SMPROGRAMS\Bacula"
-
-  ; remove files and uninstaller (preserving config for now)
-  Delete /REBOOTOK "$INSTDIR\doc\*"
-  Delete /REBOOTOK "$INSTDIR\*"
-
-  ; Check for existing installation
-  MessageBox MB_YESNO|MB_ICONQUESTION \
-  "Would you like to delete the current configuration files and the working state file?" IDNO NoDel
-    Delete /REBOOTOK "$INSTDIR\*"
-    Delete /REBOOTOK "$INSTDIR\working\*"
-    Delete /REBOOTOK "$PLUGINSDIR\bacula-*.conf"
-    Delete /REBOOTOK "$PLUGINSDIR\*console.conf"
-    Delete /REBOOTOK "$PLUGINSDIR\*conf.in"
-    Delete /REBOOTOK "$PLUGINSDIR\openssl.exe"
-    Delete /REBOOTOK "$PLUGINSDIR\libeay32.dll"
-    Delete /REBOOTOK "$PLUGINSDIR\ssleay32.dll"
-    Delete /REBOOTOK "$PLUGINSDIR\sed.exe"    
-    Delete /REBOOTOK "$PLUGINSDIR\pw.txt"     
-    Delete /REBOOTOK "$PLUGINSDIR\*.sed" 
-    Delete /REBOOTOK "$PLUGINSDIR\*.cmd"    
-    Delete /REBOOTOK "$PLUGINSDIR\*.sql"    
-    RMDir "$INSTDIR\working"
-    RMDir "$INSTDIR"
-NoDel:
-
-  ; remove directories used
-  RMDir "$INSTDIR\doc"
-  RMDir "$INSTDIR"
-SectionEnd
-
-;
-; $0 - Service Name (ie Bacula-FD)
-; $1 - Service Description (ie Bacula File Daemon)
-; $2 - Install as Service
-; $3 - Start Service now
-;
-Function InstallDaemon
-  Call InstallCommonFiles
-
-  WriteRegDWORD HKLM "Software\Bacula" "Service_$0" $2
-  
-  ${If} $2 = 1
-    nsExec::ExecToLog '"$INSTDIR\$0.exe" /install -c "$INSTDIR\$0.conf"'
-
-    ${If} $OsIsNT <> 1
-      File "Start.bat"
-      File "Stop.bat"
-    ${EndIf}
-
-    ; Start the service?
-
-    ${If} $3 = 1  
-      ${If} $OsIsNT = 1
-        nsExec::ExecToLog 'net start $0'
-      ${Else}
-        Exec '"$INSTDIR\$0.exe" -c "$INSTDIR\$0.conf"'
-      ${EndIf}
-    ${EndIf}
-  ${Else}
-    CreateShortCut "$SMPROGRAMS\Bacula\Start $1.lnk" "$INSTDIR\$0.exe" '-c "$INSTDIR\$0.conf"' "$INSTDIR\$0.exe" 0
-  ${EndIf}
-FunctionEnd
-
-Function GetComputerName
-  Push $R0
-  Push $R1
-  Push $R2
-
-  System::Call "kernel32::GetComputerNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2"
-
-  ${StrCase} $R0 $R0 "L"
-
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-!define ComputerNameDnsFullyQualified   3
-
-Function GetHostName
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ${If} $OsIsNT = 1
-    System::Call "kernel32::GetComputerNameExA(i ${ComputerNameDnsFullyQualified}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
-    ${If} $R2 = 0
-      Pop $R2
-      DetailPrint "GetComputerNameExA failed - LastError = $R2"
-      Call GetComputerName
-      Pop $R0
-    ${Else}
-      Pop $R2
-    ${EndIf}
-  ${Else}
-    Call GetComputerName
-    Pop $R0
-  ${EndIf}
-
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-!define NameUserPrincipal 8
-
-Function GetUserName
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ${If} $OsIsNT = 1
-    System::Call "secur32::GetUserNameExA(i ${NameUserPrincipal}, t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
-    ${If} $R2 = 0
-      Pop $R2
-      DetailPrint "GetUserNameExA failed - LastError = $R2"
-      Pop $R0
-      StrCpy $R0 ""
-    ${Else}
-      Pop $R2
-    ${EndIf}
-  ${Else}
-      StrCpy $R0 ""
-  ${EndIf}
-
-  ${If} $R0 == ""
-    System::Call "advapi32::GetUserNameA(t .R0, *i ${NSIS_MAX_STRLEN} R1) i.R2 ?e"
-    ${If} $R2 = 0
-      Pop $R2
-      DetailPrint "GetUserNameA failed - LastError = $R2"
-      StrCpy $R0 ""
-    ${Else}
-      Pop $R2
-    ${EndIf}
-  ${EndIf}
-
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-Function ConfigEditAndCopy
-  Push $R1
-
-  ${If} ${FileExists} "$0\$1"
-    StrCpy $R1 ".new"
-  ${Else}
-    StrCpy $R1 ""
-  ${EndIf}
-
-  nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\$1"'
-  CopyFiles "$PLUGINSDIR\$1" "$0\$1$R1"
-
-  Pop $R1
-FunctionEnd
-
-Function GetSelectedComponents
-  Push $R0
-  StrCpy $R0 0
-  ${If} ${SectionIsSelected} ${SecFileDaemon}
-    IntOp $R0 $R0 | ${ComponentFile}
-  ${EndIf}
-  ${If} ${SectionIsSelected} ${SecConsole}
-    IntOp $R0 $R0 | ${ComponentTextConsole}
-  ${EndIf}
-  ${If} ${SectionIsSelected} ${SecWxConsole}
-    IntOp $R0 $R0 | ${ComponentGUIConsole}
-  ${EndIf}
-  ${If} ${SectionIsSelected} ${SecDocPdf}
-    IntOp $R0 $R0 | ${ComponentPDFDocs}
-  ${EndIf}
-  ${If} ${SectionIsSelected} ${SecDocHtml}
-    IntOp $R0 $R0 | ${ComponentHTMLDocs}
-  ${EndIf}
-  Exch $R0
-FunctionEnd
-
-Function PageComponentsShow
-
-  Call SelectPreviousComponents
-  Call UpdateComponentUI
-FunctionEnd
-
-Function PageDirectoryPre
-  ${If} $AutomaticInstall = 1
-  ${OrIf} $InstallType = ${UpgradeInstall}
-    Abort
-  ${EndIf}
-FunctionEnd
-
-Function LeaveInstallPage
-  Push "$INSTDIR\install.log"
-  Call DumpLog
-FunctionEnd
-
-Function EnterWriteTemplates
-  Push $R0
-  Push $R1
-
-  Call GetSelectedComponents
-  Pop $R0
-
-  IntOp $R0 $R0 & ${ComponentDirector}
-  IntOp $R1 $NewComponents & ${ComponentsFileAndStorage}
-
-  ${If} $R0 <> 0
-  ${OrIf} $R1 = 0
-    Pop $R1
-    Pop $R0
-    Abort
-  ${EndIf}
-
-  IntOp $R0 $NewComponents & ${ComponentFile}
-  ${If} $R0 = 0
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" State 0
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" Flags DISABLED
-    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" State
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST|DISABLED
-  ${Else}
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" State 1
-    DeleteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 2" Flags
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 3" State "C:\$ConfigClientName.conf"
-    WriteINIStr "$PLUGINSDIR\WriteTemplates.ini" "Field 5" Flags REQ_SAVE|FILE_EXPLORER|WARN_IF_EXIST
-  ${EndIf}
-
-
-  !InsertMacro MUI_HEADER_TEXT "$(TITLE_WriteTemplates)" "$(SUBTITLE_WriteTemplates)"
-  !InsertMacro MUI_INSTALLOPTIONS_DISPLAY "WriteTemplates.ini"
-
-  !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 2" State
-  ${If} $R0 <> 0
-    File "/oname=$PLUGINSDIR\client.conf.in" "client.conf.in"
-
-    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\client.conf.in"'
-    !InsertMacro MUI_INSTALLOPTIONS_READ $R0 "WriteTemplates.ini" "Field 3" State
-    ${If} $R0 != ""
-      CopyFiles "$PLUGINSDIR\client.conf.in" "$R0"
-    ${EndIf}
-  ${EndIf}
-
-
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-Function SelectPreviousComponents
-  ${If} $InstallType <> ${NewInstall}
-    IntOp $R1 $PreviousComponents & ${ComponentFile}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecFileDaemon}
-      !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecFileDaemon}
-      !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_RO}
-    ${EndIf}
-    IntOp $R1 $PreviousComponents & ${ComponentTextConsole}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecConsole}
-      !InsertMacro SetSectionFlag ${SecConsole} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecConsole}
-      !InsertMacro ClearSectionFlag ${SecConsole} ${SF_RO}
-    ${EndIf}
-    IntOp $R1 $PreviousComponents & ${ComponentGUIConsole}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecWxConsole}
-      !InsertMacro SetSectionFlag ${SecWxConsole} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecWxConsole}
-      !InsertMacro ClearSectionFlag ${SecWxConsole} ${SF_RO}
-    ${EndIf}
-    IntOp $R1 $PreviousComponents & ${ComponentPDFDocs}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecDocPdf}
-      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecDocPdf}
-      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_RO}
-    ${EndIf}
-    IntOp $R1 $PreviousComponents & ${ComponentHTMLDocs}
-    ${If} $R1 <> 0
-      !InsertMacro SelectSection ${SecDocHtml}
-      !InsertMacro SetSectionFlag ${SecDocHtml} ${SF_RO}
-    ${Else}
-      !InsertMacro UnselectSection ${SecDocHtml}
-      !InsertMacro ClearSectionFlag ${SecDocHtml} ${SF_RO}
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
-
-Function UpdateComponentUI
-  Push $R0
-  Push $R1
-
-  Call GetSelectedComponents
-  Pop $R0
-
-  IntOp $R1 $R0 ^ $PreviousComponents
-  IntOp $NewComponents $R0 & $R1
-
-  ${If} $InstallType <> ${NewInstall}
-    IntOp $R1 $NewComponents & ${ComponentFile}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecFileDaemon} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecFileDaemon} ${SF_BOLD}
-    ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentTextConsole}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecConsole} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecConsole} ${SF_BOLD}
-    ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentGUIConsole}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecWxConsole} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecWxConsole} ${SF_BOLD}
-    ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentPDFDocs}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecDocPdf} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecDocPdf} ${SF_BOLD}
-    ${EndIf}
-    IntOp $R1 $NewComponents & ${ComponentHTMLDocs}
-    ${If} $R1 <> 0
-      !InsertMacro SetSectionFlag ${SecDocHtml} ${SF_BOLD}
-    ${Else}
-      !InsertMacro ClearSectionFlag ${SecDocHtml} ${SF_BOLD}
-    ${EndIf}
-  ${EndIf}
-
-  GetDlgItem $R0 $HWNDPARENT 1
-
-  IntOp $R1 $NewComponents & ${ComponentsRequiringUserConfig}
-  ${If} $R1 = 0
-    SendMessage $R0 ${WM_SETTEXT} 0 "STR:Install"
-  ${Else}
-    SendMessage $R0 ${WM_SETTEXT} 0 "STR:&Next >"
-  ${EndIf}
-
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-
-!include "InstallType.nsh"
-!include "ConfigPage1.nsh"
-!include "ConfigPage2.nsh"
-!include "DumpLog.nsh"