From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 25 Mar 2009 07:46:09 +0000 (+0000)
Subject: Use localhost in tls test so certificate matches
X-Git-Tag: Release-3.0.0~110
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c825e3f7da0f80f4858fdfa2cee2a969a9c9bf71;p=bacula%2Fbacula

Use localhost in tls test so certificate matches

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8592 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/scripts/tls-bacula-dir.conf.in b/regress/scripts/tls-bacula-dir.conf.in
index cc179cf6bc..64145520dc 100644
--- a/regress/scripts/tls-bacula-dir.conf.in
+++ b/regress/scripts/tls-bacula-dir.conf.in
@@ -13,7 +13,7 @@
 #
 
 Director {                            # define myself
-  Name = @hostname@-dir
+  Name = localhost-dir
   DIRPort = @dirport@                # where we listen for UA connections
   QueryFile = "@scriptdir@/query.sql"
   WorkingDirectory = "@working_dir@"
@@ -30,7 +30,7 @@ Director {                            # define myself
 Job {
   Name = "NightlySave"
   Type = Backup
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="Full Set"
   Storage = File
   Messages = Standard
@@ -43,7 +43,7 @@ Job {
 Job {
   Name = "MonsterSave"
   Type = Backup
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="Full Set"
   Storage = File1
   Messages = Standard
@@ -56,7 +56,7 @@ Job {
   Name = "VerifyVolume"
   Type = Verify
   Level = VolumeToCatalog
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="Full Set"
   Storage = File
   Messages = Standard
@@ -68,7 +68,7 @@ Job {
 Job {
   Name = "SparseTest"
   Type = Backup
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="SparseSet"
   Storage = File
   Messages = Standard
@@ -79,7 +79,7 @@ Job {
 Job {
   Name = "CompressedTest"
   Type = Backup
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="CompressedSet"
   Storage = File
   Messages = Standard
@@ -91,7 +91,7 @@ Job {
 Job {
   Name = "SparseCompressedTest"
   Type = Backup
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="SparseCompressedSet"
   Storage = File
   Messages = Standard
@@ -102,7 +102,7 @@ Job {
 Job {
   Name = "FIFOTest"
   Type = Backup
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="FIFOSet"
   Storage = File
   Messages = Standard
@@ -117,7 +117,7 @@ Job {
 Job {
   Name = "BackupCatalog"
   Type = Backup
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="Catalog"
 #  Schedule = "WeeklyCycleAfterBackup"
   Storage = File
@@ -142,7 +142,7 @@ JobDefs {
 Job {
   JobDefs = "BackupJob"
   Name = "bug621-job-1"
-  Client = @hostname@-fd
+  Client = localhost-fd
   FileSet="Full Set"
   ClientRunBeforeJob = "/bin/sleep 60"
 }
@@ -150,7 +150,7 @@ Job {
 Job {
   JobDefs = "BackupJob"
   Name = "bug621-job-2"
-  Client = @hostname@-fd
+  Client = localhost-fd
   FileSet = "Full Set"
   Max Run Time = 30
   Priority = 15
@@ -161,7 +161,7 @@ Job {
 Job {
   Name = "RestoreFiles"
   Type = Restore
-  Client=@hostname@-fd 
+  Client=localhost-fd 
   FileSet="Full Set"
   Storage = File
   Messages = Standard
@@ -256,8 +256,8 @@ FileSet {
 
 # Client (File Services) to backup
 Client {
-  Name = @hostname@-fd
-  Address = @hostname@
+  Name = localhost-fd
+  Address = localhost
   FDPort = @fdport@
   Catalog = MyCatalog
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"          # password for FileDaemon
@@ -274,7 +274,7 @@ Client {
 # Definiton of file storage device
 Storage {
   Name = File
-  Address = @hostname@                # N.B. Use a fully qualified name here
+  Address = localhost                # N.B. Use a fully qualified name here
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = FileStorage
@@ -288,7 +288,7 @@ Storage {
 
 Storage {
   Name = File1
-  Address = @hostname@                # N.B. Use a fully qualified name here
+  Address = localhost                # N.B. Use a fully qualified name here
   SDPort = @sdport@
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   Device = FileStorage1
@@ -304,7 +304,7 @@ Storage {
 # Definition of DLT tape storage device
 #Storage {
 #  Name = DLTDrive
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = localhost                # N.B. Use a fully qualified name here
 #  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = "HP DLT 80"                # must be same as Device in Storage daemon
@@ -314,7 +314,7 @@ Storage {
 # Definition of DDS tape storage device
 #Storage {
 #  Name = SDT-10000
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = localhost                # N.B. Use a fully qualified name here
 #  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"          # password for Storage daemon
 #  Device = SDT-10000                  # must be same as Device in Storage daemon
@@ -324,7 +324,7 @@ Storage {
 # Definition of 8mm tape storage device
 #Storage {
 #  Name = "8mmDrive"
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = localhost                # N.B. Use a fully qualified name here
 #  SDPort = @sdport@
 #  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
 #  Device = "Exabyte 8mm"
diff --git a/regress/scripts/tls-bacula-fd.conf.in b/regress/scripts/tls-bacula-fd.conf.in
index 2f3e53f50e..2921cd16e1 100644
--- a/regress/scripts/tls-bacula-fd.conf.in
+++ b/regress/scripts/tls-bacula-fd.conf.in
@@ -11,7 +11,7 @@
 # List Directors who are permitted to contact this File daemon
 #
 Director {
-  Name = @hostname@-dir
+  Name = localhost-dir
   Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc"
   TLS Require = yes
   TLS Certificate = "@scriptdir@/tls-cert.pem"
@@ -23,7 +23,7 @@ Director {
 # "Global" File daemon configuration specifications
 #
 FileDaemon {                          # this is me
-  Name = @hostname@-fd
+  Name = localhost-fd
   FDPort = @fdport@                  # where we listen for the director
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
@@ -37,5 +37,5 @@ FileDaemon {                          # this is me
 # Send all messages except skipped files back to Director
 Messages {
   Name = Standard
-  director = @hostname@-dir = all, !terminate, !restored
+  director = localhost-dir = all, !terminate, !restored
 }
diff --git a/regress/scripts/tls-bacula-sd.conf.in b/regress/scripts/tls-bacula-sd.conf.in
index c7fe86d621..6fef8b7bdf 100644
--- a/regress/scripts/tls-bacula-sd.conf.in
+++ b/regress/scripts/tls-bacula-sd.conf.in
@@ -11,7 +11,7 @@
 #
 
 Storage {                             # definition of myself
-  Name = @hostname@-sd
+  Name = localhost-sd
   SDPort = @sdport@                  # Director's port      
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
@@ -26,7 +26,7 @@ Storage {                             # definition of myself
 # List Directors who are permitted to contact Storage daemon
 #
 Director {
-  Name = @hostname@-dir
+  Name = localhost-dir
   Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
   TLS Require = yes
   TLS Certificate = "@scriptdir@/tls-cert.pem"
@@ -111,5 +111,5 @@ Device {
 #
 Messages {
   Name = Standard
-  director = @hostname@-dir = all, !terminate
+  director = localhost-dir = all, !terminate
 }