Moved exchange-fd plugin install to fdplugins instead of bin.

Added "Plugin Directory" entry to the config file, commented out for now.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7946 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/installer/bacula-fd.conf.in b/bacula/src/win32/installer/bacula-fd.conf.in
index bdaa4126094a87916512af4603292a27af447d14..ad63e3da66873584a9b28bc1881b9573431bb047 100644 (file)
--- a/bacula/src/win32/installer/bacula-fd.conf.in
+++ b/bacula/src/win32/installer/bacula-fd.conf.in
@@ -15,6 +15,7 @@ FileDaemon {                            # this is me
   FDport = @client_port@                # where we listen for the director\r
   WorkingDirectory = "@working_dir@"\r
   Pid Directory = "@working_dir@"\r
+  #Plugin Directory = "@fdplugins_dir@"\r
   Maximum Concurrent Jobs = @client_maxjobs@\r
 }\r
 \r

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index f6353d07fccb67d00b03fb1426d96ffda184721a..77972c812b2d62b356e08b4456feb4e4aca54e46 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -449,6 +449,9 @@ Section "-Initialize"
   ${StrRep} $R2 "$INSTDIR\bin" "\" "\\"\r
   FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n'\r
 \r
+  ${StrRep} $R2 "$INSTDIR\fdplugins" "\" "\\\\"\r
+  FileWrite $R1 's;@fdplugins_dir@;$R2;g$\r$\n'\r
+\r
   ${StrRep} $R2 "$INSTDIR" "\" "/"\r
   FileWrite $R1 "s;@BUILD_DIR@;$R2;g$\r$\n"\r
 \r
@@ -561,10 +564,12 @@ SectionGroup "Client" SecGroupClient
 Section "File Service" SecFileDaemon\r
   SectionIn 1 2 3\r
 \r
+  SetOutPath "$INSTDIR\fdplugins"\r
+  File "${SRC_DIR}\exchange-fd.dll"\r
+\r
   SetOutPath "$INSTDIR\bin"\r
 \r
   File "${SRC_DIR}\bacula-fd.exe"\r
-  File "${SRC_DIR}\exchange-fd.dll"\r
 \r
   ${If} $InstallType = ${MigrateInstall}\r
   ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf"\r