Skip to content

Commit

Permalink
windows plugin directory created and set in cfg.
Browse files Browse the repository at this point in the history
The windows installer now creates also a directory
for plugins, ususally C:\Program Files\Bareos\Plugins

Also, this directory is set in the plugin directory comment
in the default bareos-fd.conf

Also, we now have a "compatible=no" comment in the fd.conf
that tells the user that for new bareos features this has to
be set to no to disable the Bacula compatible mode.

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
  • Loading branch information
pstorz authored and Marco van Wieringen committed Feb 17, 2015
1 parent cb68cb4 commit 13f7a7d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions platforms/win32/fillup.sed
Expand Up @@ -8,3 +8,4 @@ s#@dir_password@#XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX#g
s#@dir_port@#9101#g
s#@fd_port@#9102#g
s#@sd_port@#9103#g
s#@plugindir@#"C:/Program Files/Bareos/Plugins"#g
2 changes: 2 additions & 0 deletions platforms/win32/winbareos.nsi
Expand Up @@ -311,6 +311,7 @@ SectionIn 1 2 3
SetOutPath "$INSTDIR"
SetOverwrite ifnewer
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}\Plugins"
CreateDirectory "$APPDATA\${PRODUCT_NAME}"
File "bareos-fd.exe"
File "bpipe-fd.dll"
Expand Down Expand Up @@ -919,6 +920,7 @@ ConfDeleteSkip:

Delete "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
RMDir "$SMPROGRAMS\${PRODUCT_NAME}\Plugins"
RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
RMDir "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
Expand Down
4 changes: 4 additions & 0 deletions src/filed/bareos-fd.conf.in
Expand Up @@ -34,6 +34,10 @@ FileDaemon { # this is me

# remove comment in next line to load plugins from specified directory
# Plugin Directory = @plugindir@

# if compatible is set to yes, we are compatible with bacula
# if you want to use new bareos features, please set
# compatible = no
}

# Send all messages except skipped files back to Director
Expand Down

0 comments on commit 13f7a7d

Please sign in to comment.