From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 4 Sep 2020 09:14:30 +0000 (+0200)
Subject: regress: Remove Cloud{} resource from default config files
X-Git-Tag: Release-11.3.2~1111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e29088b76791b3d648309367495085237e833c6;p=thirdparty%2Fbacula.git

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 5c1063de4..5a8bb534e 100644
--- 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 1984da8ce..92d6ce878 100644
--- 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 cbe679a7d..1385ca981 100644
--- 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 82b50c724..9c09a0ce3 100644
--- 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 b602e35be..4c541ac56 100644
--- 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 2dbfe813c..3dff8c4f8 100644
--- 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 895b104f9..94f641a40 100644
--- 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 04855969a..8c98cb602 100644
--- 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 98445ed5e..27125f349 100644
--- 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 b19876a14..314accfc5 100644
--- 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 8846b92ef..095eb7fd7 100644
--- 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 0ebede7f6..56d141923 100644
--- 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 25f09dbd2..b4db87a31 100644
--- 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 5ff24b3f9..05f39a578 100644
--- 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 3fc0eb9d8..e511a48a1 100644
--- 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 1ad6d308d..9b5de40bb 100644
--- 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 cf0d82945..a7d9dcbdb 100644
--- 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 e00105be6..dfe142eab 100755
--- 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 5f92f7a6a..f9611bd7a 100644
--- 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 e46a0c005..2afc959d8 100644
--- 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 34715a6fb..581a78801 100644
--- 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