From bde608cebf5dd22d62941a32391f71114d1d19e1 Mon Sep 17 00:00:00 2001 From: James Harper Date: Thu, 30 Oct 2008 09:18:41 +0000 Subject: [PATCH] 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 --- bacula/src/win32/installer/bacula-fd.conf.in | 1 + bacula/src/win32/installer/winbacula.nsi | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bacula/src/win32/installer/bacula-fd.conf.in b/bacula/src/win32/installer/bacula-fd.conf.in index bdaa412609..ad63e3da66 100644 --- 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 WorkingDirectory = "@working_dir@" Pid Directory = "@working_dir@" + #Plugin Directory = "@fdplugins_dir@" Maximum Concurrent Jobs = @client_maxjobs@ } diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi index f6353d07fc..77972c812b 100644 --- a/bacula/src/win32/installer/winbacula.nsi +++ b/bacula/src/win32/installer/winbacula.nsi @@ -449,6 +449,9 @@ Section "-Initialize" ${StrRep} $R2 "$INSTDIR\bin" "\" "\\" FileWrite $R1 's;@bin_dir_cmd@;$R2;g$\r$\n' + ${StrRep} $R2 "$INSTDIR\fdplugins" "\" "\\\\" + FileWrite $R1 's;@fdplugins_dir@;$R2;g$\r$\n' + ${StrRep} $R2 "$INSTDIR" "\" "/" FileWrite $R1 "s;@BUILD_DIR@;$R2;g$\r$\n" @@ -561,10 +564,12 @@ SectionGroup "Client" SecGroupClient Section "File Service" SecFileDaemon SectionIn 1 2 3 + SetOutPath "$INSTDIR\fdplugins" + File "${SRC_DIR}\exchange-fd.dll" + SetOutPath "$INSTDIR\bin" File "${SRC_DIR}\bacula-fd.exe" - File "${SRC_DIR}\exchange-fd.dll" ${If} $InstallType = ${MigrateInstall} ${AndIf} ${FileExists} "$OldInstallDir\bin\bacula-fd.conf" -- 2.39.5