Big backport from Enterprise

[bacula/bacula] / regress / scripts / bacula-dir-vtape.conf.in

diff --git a/regress/scripts/bacula-dir-vtape.conf.in b/regress/scripts/bacula-dir-vtape.conf.in
index a4ebfc1036df263676d7b9e9b64d47c26ee17d4c..ed0d5083bb37a4c7c94ccf6ebe408969e3394db6 100644 (file)
--- a/regress/scripts/bacula-dir-vtape.conf.in
+++ b/regress/scripts/bacula-dir-vtape.conf.in
@@ -188,25 +188,24 @@ Client {
 }
 
 
-Storage {
+Autochanger {
   Name = LTO1
   Address = @hostname@ 
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO
   Media Type = LTO1
-  Autochanger = yes
   Maximum Concurrent Jobs = 50
 }
 
-Storage {
+Autochanger {
   Name = LTO3
   Address = @hostname@ 
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO
   Media Type = LTO3
-  Autochanger = yes
+  SharedStorage = LTO1
   Maximum Concurrent Jobs = 50
 }
 
@@ -222,7 +221,7 @@ Storage {
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO3_0
   Media Type = LTO3
-  Autochanger = yes
+  Autochanger = LTO3
   Maximum Concurrent Jobs = 5
 }
 
@@ -233,7 +232,7 @@ Storage {
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO3_1
   Media Type = LTO3
-  Autochanger = yes
+  Autochanger = LTO3
   Maximum Concurrent Jobs = 5
 }
 
@@ -244,7 +243,7 @@ Storage {
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO3_2
   Media Type = LTO3
-  Autochanger = yes
+  Autochanger = LTO3
   Maximum Concurrent Jobs = 5
 }
 
@@ -255,7 +254,7 @@ Storage {
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO1_3
   Media Type = LTO1
-  Autochanger = yes
+  Autochanger = LTO1
   Maximum Concurrent Jobs = 5
 }
 
@@ -266,7 +265,7 @@ Storage {
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO1_4
   Media Type = LTO1
-  Autochanger = yes
+  Autochanger = LTO1
   Maximum Concurrent Jobs = 5
 }
 
@@ -277,7 +276,7 @@ Storage {
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO1_5
   Media Type = LTO1
-  Autochanger = yes
+  Autochanger = LTO1
   Maximum Concurrent Jobs = 5
 }
 
@@ -288,7 +287,7 @@ Storage {
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = LTO1-ANSI_6
   Media Type = LTO1-ANSI
-  Autochanger = yes
+  Autochanger = LTO1
   Maximum Concurrent Jobs = 5
 }
 
@@ -314,6 +313,8 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression daemon message\" %r"
+  mail = @job_email@ = all, !skipped            
   console = all, !skipped, !terminate, !restored
   append = "@working_dir@/log" = all, !skipped
   catalog = all, !skipped, !saved
@@ -323,6 +324,8 @@ Messages {
 # Message delivery for daemon messages (no job).
 Messages {
   Name = Daemon
+  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula regression\) %r\" -s \"Regression daemon message\" %r"
+  mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
   catalog = all, !skipped, !saved