systemtests: configure BackendDirectory for SDs

this patch amends the SD configuration in every systemtest to have the
correct BackendDirectory set, so we can load dynamic backends during
testing.
It also removed the BackendDirectory when built without dynamic
backends.

60 files changed, 77 insertions, 12 deletions

diff --git a/cmake/BareosSetVariableDefaults.cmake b/cmake/BareosSetVariableDefaults.cmake
index 811298982..eb7c56087 100644
--- a/cmake/BareosSetVariableDefaults.cmake
+++ b/cmake/BareosSetVariableDefaults.cmake
@@ -1,6 +1,6 @@
 #   BAREOS® - Backup Archiving REcovery Open Sourced
 #
-#   Copyright (C) 2017-2021 Bareos GmbH & Co. KG
+#   Copyright (C) 2017-2022 Bareos GmbH & Co. KG
 #
 #   This program is Free Software; you can redistribute it and/or
 #   modify it under the terms of version three of the GNU Affero General Public
@@ -394,15 +394,17 @@ else()
 endif()
 
 # dynamic-storage-backends
-if(NOT DEFINED dynamic-storage-backends)
+if(NOT DEFINED dynamic-storage-backends OR dynamic-storage-backends)
   set(dynamic-storage-backends ON)
-  set(HAVE_DYNAMIC_SD_BACKENDS 1)
+  set(HAVE_DYNAMIC_SD_BACKENDS
+      1
+      CACHE INTERNAL ""
+  )
 else()
-  if(${dynamic-storage-backends})
-    set(HAVE_DYNAMIC_SD_BACKENDS 1)
-  else()
-    set(HAVE_DYNAMIC_SD_BACKENDS 0)
-  endif()
+  set(HAVE_DYNAMIC_SD_BACKENDS
+      0
+      CACHE INTERNAL ""
+  )
 endif()
 
 # scsi-crypto
diff --git a/systemtests/cmake/BareosSystemtestFunctions.cmake b/systemtests/cmake/BareosSystemtestFunctions.cmake
index 05862ff67..dfb955903 100644
--- a/systemtests/cmake/BareosSystemtestFunctions.cmake
+++ b/systemtests/cmake/BareosSystemtestFunctions.cmake
@@ -347,6 +347,14 @@ macro(prepare_testdir_for_daemon_run)
 
   set(backenddir ${BACKEND_DIR_TO_TEST})
   set(sd_backenddir ${SD_BACKEND_DIR_TO_TEST})
+  # the SD will not suppot the BackendDirectory setting if it was not built with
+  # HAVE_DYNAMIC_SD_BACKENDS, thus we declare `sd_backend_config` that will
+  # evaluate to nothing if we don't have dynamic backends enabled.
+  if(HAVE_DYNAMIC_SD_BACKENDS)
+    set(sd_backend_config "BackendDirectory = \"${SD_BACKEND_DIR_TO_TEST}\"")
+  else()
+    set(sd_backend_config "")
+  endif()
   set(BAREOS_WEBUI_PUBLIC_DIR ${WEBUI_PUBLIC_DIR_TO_TEST})
 
   set(dbHost ${current_test_directory}/tmp)
diff --git a/systemtests/tests/acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/always-incremental-consolidate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/autochanger/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/autochanger/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 45c1fa0cf..14e2fd4eb 100644
--- a/systemtests/tests/autochanger/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/autochanger/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,5 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
-  BackendDirectory = @sd_backenddir@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/bareos-acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/bareos-acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/bareos-acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/bareos-acl/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 5dc406dca..ed2f80e4c 100644
--- a/systemtests/tests/bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,6 @@ Storage {
   Plugin Names = "autoxflate"
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
+  ## @sd_backend_config@ ##
 }
diff --git a/systemtests/tests/bconsole/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/bconsole/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/bconsole/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/bconsole/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/block-size/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/block-size/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 45c1fa0cf..14e2fd4eb 100644
--- a/systemtests/tests/block-size/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/block-size/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,5 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
-  BackendDirectory = @sd_backenddir@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/bscan-bextract-bls-bcopy/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/bscan-bextract-bls-bcopy/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/bscan-bextract-bls-bcopy/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/bscan-bextract-bls-bcopy/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/checkpoints/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/checkpoints/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 92656f4b5..f0d7f842d 100644
--- a/systemtests/tests/checkpoints/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/checkpoints/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -8,5 +8,6 @@ Storage {
   #
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
   Checkpoint Interval = 3
 }
diff --git a/systemtests/tests/chflags/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/chflags/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/chflags/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/chflags/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/client-initiated/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/client-initiated/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/client-initiated/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/client-initiated/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index d555776e0..e8518885b 100644
--- a/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/commandline-options/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -8,4 +8,5 @@ Storage {
   #
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/config-syntax-crash/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/config-syntax-crash/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/config-syntax-crash/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/config-syntax-crash/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/copy-archive-job/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/copy-archive-job/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 622a6d444..ed481dae4 100644
--- a/systemtests/tests/copy-archive-job/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/copy-archive-job/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/copy-migrate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/copy-migrate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/copy-migrate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/copy-migrate/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/storage/bareos-sd.conf.in
index 2fb2d6411..a16df7669 100644
--- a/systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/copy-remote-bscan/etc/bareos-remote/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd2_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/copy-remote-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/dbcopy-mysql-postgresql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/dbcopy-mysql-postgresql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/dbcopy-mysql-postgresql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/dbcopy-mysql-postgresql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/deprecation/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/deprecation/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/deprecation/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/deprecation/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c2d9bfadd..14e2fd4eb 100644
--- a/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/droplet-s3/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -8,7 +8,7 @@ Storage {
   #
   # Plugin Directory = "@python_plugin_module_src_sd@"
   # Plugin Names = ""
-  BackendDirectory = "@sd_backenddir@"
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/encrypt-signature-no-tls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c03e379d5..d4a918273 100644
--- a/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/encrypt-signature-tls-cert/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,6 +10,7 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 
   TLS Enable = yes
   TLS Require = yes
diff --git a/systemtests/tests/fileset-multiple-blocks/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/fileset-multiple-blocks/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/fileset-multiple-blocks/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/fileset-multiple-blocks/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/filesets/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/filesets/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/filesets/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/filesets/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/gfapi-fd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/gfapi-fd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/gfapi-fd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/gfapi-fd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/glusterfs-backend/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/glusterfs-backend/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index ee35c51d6..14e2fd4eb 100644
--- a/systemtests/tests/glusterfs-backend/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/glusterfs-backend/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -9,6 +9,6 @@ Storage {
   # Plugin Directory = "@python_plugin_module_src_sd@"
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
-  Backend Directory = "@sd_backenddir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/list-backups/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/list-backups/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/list-backups/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/list-backups/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/multiplied-device/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/multiplied-device/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/multiplied-device/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/multiplied-device/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/ndmp/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/ndmp/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 373a13239..ed3478721 100644
--- a/systemtests/tests/ndmp/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/ndmp/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -8,4 +8,5 @@ Storage {
   Plugin Names = "autoxflate"
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/notls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/notls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/notls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/notls/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/parallel-jobs/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/parallel-jobs/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index d555776e0..e8518885b 100644
--- a/systemtests/tests/parallel-jobs/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/parallel-jobs/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -8,4 +8,5 @@ Storage {
   #
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/passive/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/passive/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/passive/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/passive/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/pruning/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/pruning/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/pruning/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/pruning/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index de00c2e35..763fcad3c 100644
--- a/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-dir/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-contrib-bareos_tasks_mysql/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-ldap/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-libcloud/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-local-fileset-basic/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-local-fileset-restoreobject/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 3e1723fa6..3e8d20d14 100644
--- a/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-mariabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -11,4 +11,5 @@ Storage {
   Working Directory =  "@working_dir@"
   Pid Directory =  "@piddir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-ovirt/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-percona-xtrabackup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-fd-vmware/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 66ee623e6..623634277 100644
--- a/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py2plug-sd/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   Plugin Names = "@python_module_name@"
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py3plug-fd-contrib-mysql_dump/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-contrib-mysql_dump/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py3plug-fd-contrib-mysql_dump/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py3plug-fd-contrib-mysql_dump/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/py3plug-fd-postgres/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/py3plug-fd-postgres/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/py3plug-fd-postgres/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/py3plug-fd-postgres/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/python-bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/python-bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/python-bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/python-bareos/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/quota-softquota/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/quota-softquota/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/quota-softquota/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/quota-softquota/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/restapi/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/restapi/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/restapi/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/restapi/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/scheduler-backup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/scheduler-backup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/scheduler-backup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/scheduler-backup/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/sparse-file/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/sparse-file/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/sparse-file/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/sparse-file/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/spool/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/spool/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/spool/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/spool/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/stresstest/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/stresstest/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index 8847967d8..99b0aa967 100644
--- a/systemtests/tests/stresstest/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/stresstest/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -8,5 +8,6 @@ Storage {
   #
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
   #Checkpoint Interval = 30
 }
diff --git a/systemtests/tests/truncate-command/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/truncate-command/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/truncate-command/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/truncate-command/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/virtualfull-bscan/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/virtualfull/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/webui-common/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/webui-common/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/webui-common/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/webui-common/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }
diff --git a/systemtests/tests/xattr/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in b/systemtests/tests/xattr/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
index c10462de6..14e2fd4eb 100644
--- a/systemtests/tests/xattr/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
+++ b/systemtests/tests/xattr/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
@@ -10,4 +10,5 @@ Storage {
   # Plugin Names = ""
   Working Directory =  "@working_dir@"
   SD Port = @sd_port@
+  @sd_backend_config@
 }