BEE Backport regress/scripts/copy-tls-confs

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Jan 27 12:12:35 2020 +0100

    regress: Use TLS console in tls tests

diff --git a/regress/scripts/copy-tls-confs b/regress/scripts/copy-tls-confs
index eece9c62d0db65223384674eb9dfbeac472e593b..5e9e2dd44a9c1b0d83cfb15a818a3491b02ce8d9 100755 (executable)
--- a/regress/scripts/copy-tls-confs
+++ b/regress/scripts/copy-tls-confs
@@ -8,7 +8,7 @@
 cp -f scripts/tls-bacula-dir.conf ${conf}/bacula-dir.conf
 cp -f scripts/tls-bacula-sd.conf ${conf}/bacula-sd.conf
 cp -f scripts/tls-bacula-fd.conf ${conf}/bacula-fd.conf
-cp -f scripts/test-console.conf ${conf}/bconsole.conf
-cp -f scripts/test-console.conf ${conf}/bat.conf
+cp -f scripts/tls-console.conf ${conf}/bconsole.conf
+cp -f scripts/tls-console.conf ${conf}/bat.conf
 cp -f scripts/tls-CA.pem ${conf}/tls-CA.pem
 cp -f scripts/tls-cert.pem ${conf}/tls-cert.pem