regress: Remove Cloud{} resource from default config files

The cloud resource is automatically added when FORCE_CLOUD=yes

diff --git a/regress/scripts/bacula-sd-2d.conf.in b/regress/scripts/bacula-sd-2d.conf.in
index 5c1063de4ee3afc65c9f47d3dbcb8e4582647420..5a8bb534e34085474c5fc93aa88fa09f9f97540e 100644 (file)
--- a/regress/scripts/bacula-sd-2d.conf.in
+++ b/regress/scripts/bacula-sd-2d.conf.in
@@ -67,15 +67,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-2disk-drive.conf.in b/regress/scripts/bacula-sd-2disk-drive.conf.in
index 1984da8ceb4b505041eb53d78b18d1ec68643c76..92d6ce8782d1d173a35b7a866708287407fa7d03 100644 (file)
--- a/regress/scripts/bacula-sd-2disk-drive.conf.in
+++ b/regress/scripts/bacula-sd-2disk-drive.conf.in
@@ -184,16 +184,4 @@ Autochanger {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-2disk-virtual.conf.in b/regress/scripts/bacula-sd-2disk-virtual.conf.in
index cbe679a7d3dfff65839f52a08816c311f51eeb34..1385ca981b71ab8dfa2f32e9e3746aac91c74bbb 100644 (file)
--- a/regress/scripts/bacula-sd-2disk-virtual.conf.in
+++ b/regress/scripts/bacula-sd-2disk-virtual.conf.in
@@ -238,16 +238,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-2disk.conf.in b/regress/scripts/bacula-sd-2disk.conf.in
index 82b50c724d750bbac256fc1c9e214326f6690ca1..9c09a0ce340baf24bc0f0d8ec8829f7c562f385e 100644 (file)
--- a/regress/scripts/bacula-sd-2disk.conf.in
+++ b/regress/scripts/bacula-sd-2disk.conf.in
@@ -117,16 +117,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-2drive.conf.in b/regress/scripts/bacula-sd-2drive.conf.in
index b602e35be38df34f8b6af0038f851e49ef38e08c..4c541ac56ae5f1a87c27bb92d2fbde942e2f4007 100644 (file)
--- a/regress/scripts/bacula-sd-2drive.conf.in
+++ b/regress/scripts/bacula-sd-2drive.conf.in
@@ -72,4 +72,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-2media-virtual.conf.in b/regress/scripts/bacula-sd-2media-virtual.conf.in
index 2dbfe813c38ca1b3bad800d6dea68ffd12327d10..3dff8c4f8c8792278bc7fbd667e48f7ad79913b9 100644 (file)
--- a/regress/scripts/bacula-sd-2media-virtual.conf.in
+++ b/regress/scripts/bacula-sd-2media-virtual.conf.in
@@ -388,16 +388,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-2tape.conf.in b/regress/scripts/bacula-sd-2tape.conf.in
index 895b104f99e0992b97eb5cecc666d944d2ce55b3..94f641a40b644438c29d3170660452d4af7661f9 100644 (file)
--- a/regress/scripts/bacula-sd-2tape.conf.in
+++ b/regress/scripts/bacula-sd-2tape.conf.in
@@ -59,15 +59,3 @@ Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
 }
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-

diff --git a/regress/scripts/bacula-sd-4disk.conf.in b/regress/scripts/bacula-sd-4disk.conf.in
index 04855969af9bee8a43e970e0e94d65a0e2f3d4c8..8c98cb6022fee2f45a53166305c9f611cb60614a 100644 (file)
--- a/regress/scripts/bacula-sd-4disk.conf.in
+++ b/regress/scripts/bacula-sd-4disk.conf.in
@@ -172,13 +172,3 @@ Messages {
   director = @hostname@-dir = all, !terminate
 }
 
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}

diff --git a/regress/scripts/bacula-sd-btape.conf.in b/regress/scripts/bacula-sd-btape.conf.in
index 98445ed5e1a881c843d3ae142d01e6f1ae3d1d8e..27125f3499ea30b0309c8077d3fb92d93274caea 100644 (file)
--- a/regress/scripts/bacula-sd-btape.conf.in
+++ b/regress/scripts/bacula-sd-btape.conf.in
@@ -65,16 +65,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-migration.conf.in b/regress/scripts/bacula-sd-migration.conf.in
index b19876a140dad2106c2b242b748d22b3dc21552d..314accfc59f1fcdb310a619348c1ac63811a2291 100644 (file)
--- a/regress/scripts/bacula-sd-migration.conf.in
+++ b/regress/scripts/bacula-sd-migration.conf.in
@@ -71,14 +71,3 @@ Messages {
   director = @hostname@-dir = all, !terminate
 }
 
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-

diff --git a/regress/scripts/bacula-sd-tape.conf.in b/regress/scripts/bacula-sd-tape.conf.in
index 8846b92ef97c42e24440cb6796780403658eef83..095eb7fd74975e25a86dd60f692b1c983161fdf3 100644 (file)
--- a/regress/scripts/bacula-sd-tape.conf.in
+++ b/regress/scripts/bacula-sd-tape.conf.in
@@ -55,15 +55,4 @@ Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
   append = "@working_dir@/log1.sd" = all
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-virtual-tape.conf.in b/regress/scripts/bacula-sd-virtual-tape.conf.in
index 0ebede7f65af7d782088150d2462450ae2160dab..56d1419230796042c2a0dd8c6b2f378a4942a3a8 100644 (file)
--- a/regress/scripts/bacula-sd-virtual-tape.conf.in
+++ b/regress/scripts/bacula-sd-virtual-tape.conf.in
@@ -65,16 +65,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-virtual.conf.in b/regress/scripts/bacula-sd-virtual.conf.in
index 25f09dbd21d57ac843528b868ee0d3c08e73b908..b4db87a3184e8d3227492c53cdefb545888e7d8f 100644 (file)
--- a/regress/scripts/bacula-sd-virtual.conf.in
+++ b/regress/scripts/bacula-sd-virtual.conf.in
@@ -83,16 +83,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/bacula-sd-vtape.conf.in b/regress/scripts/bacula-sd-vtape.conf.in
index 5ff24b3f915c8fd02db2173782f2c44e5398e65e..05f39a5788886ab4c37447d87b01a32c022ef06b 100644 (file)
--- a/regress/scripts/bacula-sd-vtape.conf.in
+++ b/regress/scripts/bacula-sd-vtape.conf.in
@@ -183,15 +183,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
+}
\ No newline at end of file

diff --git a/regress/scripts/broken-media-bug-2-bacula-sd.conf.in b/regress/scripts/broken-media-bug-2-bacula-sd.conf.in
index 3fc0eb9d8f4360e9a97f766954dec3a04cc5d3af..e511a48a1e0f02f19f2d6c8be48c64b4aa918bc8 100644 (file)
--- a/regress/scripts/broken-media-bug-2-bacula-sd.conf.in
+++ b/regress/scripts/broken-media-bug-2-bacula-sd.conf.in
@@ -104,15 +104,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
+}
\ No newline at end of file

diff --git a/regress/scripts/collect-bacula-sd.conf.in b/regress/scripts/collect-bacula-sd.conf.in
index 1ad6d308d2fa74ae81f0ce0772ec2c4ad189e50e..9b5de40bb4b4824de351e4045d2c8a1760d8a271 100644 (file)
--- a/regress/scripts/collect-bacula-sd.conf.in
+++ b/regress/scripts/collect-bacula-sd.conf.in
@@ -120,17 +120,6 @@ Messages {
   director = @hostname@-dir = all, !terminate
 }
 
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
 Statistics {
   Name = CSV1
   Interval = 1 minute

diff --git a/regress/scripts/migrate-bacula-sd.conf.in b/regress/scripts/migrate-bacula-sd.conf.in
index cf0d829458ef3ce510b4b3bf2a9ec1b9eb7eb149..a7d9dcbdb9a85d480e5da2e4598c2922d0b5d31a 100644 (file)
--- a/regress/scripts/migrate-bacula-sd.conf.in
+++ b/regress/scripts/migrate-bacula-sd.conf.in
@@ -173,15 +173,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
+}
\ No newline at end of file

diff --git a/regress/scripts/prepare-other-loc b/regress/scripts/prepare-other-loc
index e00105be6225441357ef62b99d99a413b637fc53..dfe142eabe7e4a3f69e1ea6f2d95f712e6e95bda 100755 (executable)
--- a/regress/scripts/prepare-other-loc
+++ b/regress/scripts/prepare-other-loc
@@ -19,3 +19,4 @@ if [ x$plugins != x ]; then
     mv $cwd/bin/plugins $cwd/bin/plugins.org
     ln -s $plugins $cwd/bin/plugins
 fi
+

diff --git a/regress/scripts/test-bacula-sd.conf.in b/regress/scripts/test-bacula-sd.conf.in
index 5f92f7a6a214b05e63c402063e5f74f703f2f403..f9611bd7a6598cb731f2c7909c3af6d7528e5e0b 100644 (file)
--- a/regress/scripts/test-bacula-sd.conf.in
+++ b/regress/scripts/test-bacula-sd.conf.in
@@ -119,14 +119,3 @@ Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
 }
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}

diff --git a/regress/scripts/tls-auth-bacula-sd.conf.in b/regress/scripts/tls-auth-bacula-sd.conf.in
index e46a0c0059bcf78ba10257ed3685d66918202cd5..2afc959d8296a99438ed82dc90b180543d024618 100644 (file)
--- a/regress/scripts/tls-auth-bacula-sd.conf.in
+++ b/regress/scripts/tls-auth-bacula-sd.conf.in
@@ -114,15 +114,4 @@ Device {
 Messages {
   Name = Standard
   director = @hostname@-dir = all, !terminate
-}
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
-
+}
\ No newline at end of file

diff --git a/regress/scripts/tls-bacula-sd.conf.in b/regress/scripts/tls-bacula-sd.conf.in
index 34715a6fb7a86e35130354ccd67859c2ab0c6855..581a7880102bd3a0a7868be5370a7406c9d95ea6 100644 (file)
--- a/regress/scripts/tls-bacula-sd.conf.in
+++ b/regress/scripts/tls-bacula-sd.conf.in
@@ -112,15 +112,4 @@ Device {
 Messages {
   Name = Standard
   director = localhost-dir = all, !terminate
-}
-
-Cloud {
-  Name = DummyCloud
-  Driver = "File"
-  HostName = "@tmpdir@/cloud"
-  BucketName = "DummyBucket"
-  AccessKey = "DummyAccessKey"
-  SecretKey = "DummySecretKey"
-  Protocol = HTTPS
-  UriStyle = VirtualHost
-}
+}
\ No newline at end of file