Final changes

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

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index 5f1b13cda01d622bf25eee71091da6af62d49f79..9efaf661582527b103f9756406147c6d274f83e6 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -21,7 +21,7 @@ Director {                            # define myself
   SubSysDirectory = "@subsysdir@"
   Maximum Concurrent Jobs = 4
   Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3"         # Console password
-  Messages = Daemon
+  Messages = Standard
 }
 
 JobDefs {
@@ -74,24 +74,24 @@ Job {
   Name = "RUN_DIR_FAILED"
   FileSet = FS_TESTJOB  
   JobDefs = DefaultJob
-  RunBeforeJob = "/bin/false"
+  RunBeforeJob = "/bin/false RUN_DIR_FAILED"
   Run After Failed Job = "/bin/echo RunAfterFailedJob"
 }
 
-#@hostname@-fd: ClientBeforeJob: run command "/bin/false"
-#@hostname@-fd: ClientBeforeJob: run command "/bin/false 2"
+#@hostname@-fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"
+#@hostname@-fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"
 #@hostname@-dir: AfterJob: run command "/bin/echo RunAfterFailedJob"
 Job {
   Name = "RUN_FD_FAILED"
   FileSet = FS_TESTJOB  
   JobDefs = DefaultJob
   RunScript {
-    Command = "/bin/false"
+    Command = "/bin/false RUN_FD_FAILED1"
     abortjobonerror = no
     RunsWhen = Before
   }
   RunScript {
-    Command = "/bin/false 2"
+    Command = "/bin/false RUN_FD_FAILED2"
     abortjobonerror = yes
     RunsWhen = Before
   }
@@ -99,14 +99,14 @@ Job {
   Run After Failed Job = "/bin/echo RunAfterFailedJob"
 }
 
-#@hostname@-fd: ClientBeforeJob: run command "/bin/false"
+#@hostname@-fd: ClientBeforeJob: run command "/bin/false RUN_FD_WARNING"
 #Backup OK -- with warnings
 Job {
   Name = "RUN_FD_WARNING"
   FileSet = FS_TESTJOB  
   JobDefs = DefaultJob
   RunScript {
-    Command = "/bin/false After False"
+    Command = "/bin/false RUN_FD_WARNING"
     abortjobonerror = no
     RunsWhen = Before
   }
@@ -146,40 +146,7 @@ Catalog {
 
 Messages {
   Name = Standard
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r
-"
-  MailOnError = @job_email@ = all
-  operator = @job_email@ = mount
-  console = all, !skipped, !terminate, !restored
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if the scroll off the console.
-#
-  append = "@working_dir@/log" = all, !skipped
-}
-
-Messages {
-  Name = NoEmail
-  mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  console = all, !skipped, !terminate
-#
-# WARNING! the following will create a file that you must cycle from
-#          time to time as it will grow indefinitely. However, it will
-#          also keep all your messages if the scroll off the console.
-#
-  append = "@working_dir@/log" = all, !skipped
-}
-
-
-# Message delivery for daemon messages (no job).
-Messages {
-  Name = Daemon
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
-  mail = @job_email@ = all, !skipped
-  console = all, !skipped, !saved
-  append = "@working_dir@/log" = all, !skipped
+  stdout = all, !skipped
 }
 
 # Default pool definition