From: Robert Nelson <robertn@the-nelsons.org>
Date: Sat, 2 Dec 2006 14:18:54 +0000 (+0000)
Subject: Merge unix regress changes into Windows port.
X-Git-Tag: Release-7.0.0~7300
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=560afcbc5befabcf91e698ae6e06fdf563e4212e;p=bacula%2Fbacula

Merge unix regress changes into Windows port.

Port migration tests.


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

diff --git a/regress/scripts/bacula-sd-2disk-drive.conf b/regress/scripts/bacula-sd-2disk-drive.conf
deleted file mode 100644
index 1d56020cf3..0000000000
--- a/regress/scripts/bacula-sd-2disk-drive.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Default Bacula Storage Daemon Configuration file
-#
-#  For Bacula release 1.39
-#
-# You may need to change the name of your tape drive
-#   on the "Archive Device" directive in the Device
-#   resource.  If you change the Name and/or the 
-#   "Media Type" in the Device resource, please ensure
-#   that dird.conf has corresponding changes.
-#
-
-Storage {                             # definition of myself
-  Name = localhost-sd
-  SDPort = 8103                  # Director's port      
-  WorkingDirectory = "/home/kern/bacula/regress/working"
-  Pid Directory = "/home/kern/bacula/regress/working"
-  Subsys Directory = "/home/kern/bacula/regress/working"
-}
-
-#
-# List Directors who are permitted to contact Storage daemon
-#
-Director {
-  Name = localhost-dir
-  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
-}
-
-#
-# Devices supported by this Storage daemon
-# To connect, the Director's bacula-dir.conf must have the
-#  same Name and MediaType. 
-#
-Autochanger {
-  Name = DDS-4
-  Changer Device = /home/kern/bacula/regress/tmp/disk-changer/conf
-  Changer Command ="/home/kern/bacula/regress/bin/disk-changer %c %o %S %a %d"
-  Device = Drive-0, Drive-1
-}
-
-Device {
-  Name = Drive-0
-  Device Type = File
-  Media Type = DDS-4
-  Archive Device = /home/kern/bacula/regress/tmp/disk-changer/drive0
-  AutomaticMount = yes;               # when device opened, read it
-  Autochanger = yes
-  Drive Index = 0
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
-# Maximum File Size = 1000000
-}
-
-Device {
-  Name = Drive-1
-  Device Type = File
-  Media Type = DDS-4
-  Archive Device = /home/kern/bacula/regress/tmp/disk-changer/drive1
-  AutomaticMount = yes;               # when device opened, read it
-  Autochanger = yes
-  Drive Index = 1
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
-# Maximum File Size = 1000000
-}
-
-
-# 
-# Send all messages to the Director, 
-# mount messages also are sent to the email address
-#
-Messages {
-  Name = Standard
-  director = localhost-dir = all, !terminate
-}
diff --git a/regress/scripts/bacula-sd-2disk.conf b/regress/scripts/bacula-sd-2disk.conf
deleted file mode 100644
index 00594665b5..0000000000
--- a/regress/scripts/bacula-sd-2disk.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Default Bacula Storage Daemon Configuration file
-#
-#  For Bacula release 1.39
-#
-# You may need to change the name of your tape drive
-#   on the "Archive Device" directive in the Device
-#   resource.  If you change the Name and/or the 
-#   "Media Type" in the Device resource, please ensure
-#   that dird.conf has corresponding changes.
-#
-
-Storage {                             # definition of myself
-  Name = localhost-sd
-  SDPort = 8103                  # Director's port      
-  WorkingDirectory = "/home/kern/bacula/regress/working"
-  Pid Directory = "/home/kern/bacula/regress/working"
-  Subsys Directory = "/home/kern/bacula/regress/working"
-}
-
-#
-# List Directors who are permitted to contact Storage daemon
-#
-Director {
-  Name = localhost-dir
-  Password = "ccV3lVTsQRsdIUGyab0N4sMDavui2hOBkmpBU0aQKOr9"
-}
-
-#
-# Devices supported by this Storage daemon
-# To connect, the Director's bacula-dir.conf must have the
-#  same Name and MediaType. 
-#
-Autochanger {
-  Name = DDS-4
-  Changer Device = /home/kern/bacula/regress/tmp/disk-changer/conf
-  Changer Command ="/home/kern/bacula/regress/bin/disk-changer %c %o %S %a %d"
-  Device = Drive-0
-}
-
-Device {
-  Name = Drive-0                   # 
-  Device Type = File
-  Media Type = DDS-4
-  Archive Device = /home/kern/bacula/regress/tmp/disk-changer/drive0
-  AutomaticMount = yes;               # when device opened, read it
-  Autochanger = yes
-  Drive Index = 0
-  AlwaysOpen = yes;
-  RemovableMedia = yes;
-# Maximum File Size = 1000000
-}
-
-
-# 
-# Send all messages to the Director, 
-# mount messages also are sent to the email address
-#
-Messages {
-  Name = Standard
-  director = localhost-dir = all, !terminate
-}