From 34a061c826d9bd0ad9d8a0c01828c651a5f74f6c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 13 Nov 2003 13:49:12 +0000 Subject: [PATCH] Update smtp to bsmtp and console to bconsole git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@806 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/bacula-dir-tape.conf.in | 4 ++-- regress/scripts/copy-confs | 2 +- regress/scripts/copy-tape-confs | 2 +- regress/scripts/copy-test-confs | 2 +- regress/scripts/copy-testa-confs | 2 +- regress/scripts/flist | 2 +- regress/scripts/test-bacula-dir.conf.in | 6 +++--- regress/scripts/testa-bacula-dir.conf.in | 6 +++--- regress/tests/backup-bacula-tape | 2 +- regress/tests/backup-bacula-test | 2 +- regress/tests/bextract-test | 2 +- regress/tests/bscan-test | 4 ++-- regress/tests/bsr-opt-test | 2 +- regress/tests/compressed-test | 2 +- regress/tests/concurrent-jobs-test | 2 +- regress/tests/dev-test-root | 2 +- regress/tests/etc-test-root | 2 +- regress/tests/four-concurrent-jobs-test | 2 +- regress/tests/four-jobs-test | 10 +++++----- regress/tests/incremental-test | 4 ++-- regress/tests/lib-test-root | 2 +- regress/tests/recycle-test | 2 +- regress/tests/restore-by-file-tape | 4 ++-- regress/tests/restore-by-file-test | 2 +- regress/tests/restore2-by-file-test | 2 +- regress/tests/six-vol-test | 2 +- regress/tests/small-file-size-tape | 2 +- regress/tests/span-vol-test | 2 +- regress/tests/sparse-compressed-test | 2 +- regress/tests/sparse-test | 2 +- regress/tests/two-jobs-test | 4 ++-- regress/tests/two-vol-test | 2 +- regress/tests/two-volume-tape | 2 +- regress/tests/verify-vol-test | 2 +- regress/tests/weird-files-test | 2 +- regress/tests/weird-files2-test | 4 ++-- 36 files changed, 50 insertions(+), 50 deletions(-) diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in index da9ac34c19..bc22c35a4e 100644 --- a/regress/scripts/bacula-dir-tape.conf.in +++ b/regress/scripts/bacula-dir-tape.conf.in @@ -107,8 +107,8 @@ Catalog { # and to the console Messages { Name = Standard - mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" - operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r" + 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 diff --git a/regress/scripts/copy-confs b/regress/scripts/copy-confs index ee77a34c59..d1e6cc1c36 100755 --- a/regress/scripts/copy-confs +++ b/regress/scripts/copy-confs @@ -2,4 +2,4 @@ /bin/cp -f scripts/bacula-dir.conf bin/bacula-dir.conf /bin/cp -f scripts/bacula-sd.conf bin/bacula-sd.conf /bin/cp -f scripts/bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/console.conf bin/console.conf +/bin/cp -f scripts/bconsole.conf bin/bconsole.conf diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs index 28223b0654..588dddc35b 100755 --- a/regress/scripts/copy-tape-confs +++ b/regress/scripts/copy-tape-confs @@ -2,4 +2,4 @@ /bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf /bin/cp -f scripts/bacula-sd-tape.conf bin/bacula-sd.conf /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/console.conf +/bin/cp -f scripts/test-console.conf bin/bconsole.conf diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs index 45a30a2425..02a1b702ff 100755 --- a/regress/scripts/copy-test-confs +++ b/regress/scripts/copy-test-confs @@ -2,4 +2,4 @@ /bin/cp -f scripts/test-bacula-dir.conf bin/bacula-dir.conf /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/console.conf +/bin/cp -f scripts/test-console.conf bin/bconsole.conf diff --git a/regress/scripts/copy-testa-confs b/regress/scripts/copy-testa-confs index 0574b9a638..6b5f30c3ef 100755 --- a/regress/scripts/copy-testa-confs +++ b/regress/scripts/copy-testa-confs @@ -2,4 +2,4 @@ /bin/cp -f scripts/testa-bacula-dir.conf bin/bacula-dir.conf /bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf /bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/console.conf +/bin/cp -f scripts/test-console.conf bin/bconsole.conf diff --git a/regress/scripts/flist b/regress/scripts/flist index 8466a4da32..7e7e1f0bf8 100644 --- a/regress/scripts/flist +++ b/regress/scripts/flist @@ -4,7 +4,7 @@ /build/src/tools/testfind /build/Makefile.in /build/src/dird/bacula-dir -/build/src/console/console +/build/src/console/bconsole /build/src/filed/bacula-fd /build/src/findlib/find_one.c /build/src/jcr.h diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in index e584b9f5d3..64416b8587 100644 --- a/regress/scripts/test-bacula-dir.conf.in +++ b/regress/scripts/test-bacula-dir.conf.in @@ -261,8 +261,8 @@ Catalog { # and to the console Messages { Name = Standard - mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" - operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r" + 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 @@ -276,7 +276,7 @@ Messages { Messages { Name = NoEmail - mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" + mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" console = all, !skipped # # WARNING! the following will create a file that you must cycle from diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in index ed85af448f..ca3b284b01 100644 --- a/regress/scripts/testa-bacula-dir.conf.in +++ b/regress/scripts/testa-bacula-dir.conf.in @@ -108,8 +108,8 @@ Catalog { # and to the console Messages { Name = Standard - mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" - operatorcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: Intervention needed for %j\" %r" + 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 @@ -119,7 +119,7 @@ Messages { Messages { Name = NoEmail - mailcommand = "@sbindir@/smtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" + mailcommand = "@sbindir@/bsmtp -h localhost -f \"\(Bacula Regression\) %r\" -s \"Bacula: %t %e of %c %l\" %r" console = all, !skipped append = "@working_dir@/log" = all, !skipped diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index a96910989c..f83fa5b625 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -18,7 +18,7 @@ echo " === Starting Bacula tape test ===" >>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <&1 >/dev/null echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <&1 >/dev/null -bin/console -c bin/console.conf <&1 >/dev/null bin/drop_sqlite_tables bin/make_sqlite_tables bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <&1 >/dev/null bin/bacula start -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <${cwd}/tmp/build/ficheriro1.txt echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -bin/console -c bin/console.conf <&1 >/dev/null -bin/console -c bin/console.conf <working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <>working/log echo " " bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <${cwd}/tmp/original bin/bacula start 2>&1 >/dev/null -bin/console -c bin/console.conf <