From eab7741ed9baf3ae876e257a1711b75cd7c59771 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 25 Jul 2006 13:26:32 +0000 Subject: [PATCH] Apply Ludovic's patches --- docs/developers/version.tex | 2 +- docs/home-page/pages/documentation.php | 18 ------ docs/manual-de/version.tex | 2 +- docs/manual/autochangerres.tex | 4 +- docs/manual/catmaintenance.tex | 9 ++- docs/manual/consoleconf.tex | 8 --- docs/manual/firewalls.tex | 82 ++++++++++++++------------ docs/manual/storedconf.tex | 47 +++++++-------- docs/manual/version.tex | 2 +- 9 files changed, 78 insertions(+), 96 deletions(-) diff --git a/docs/developers/version.tex b/docs/developers/version.tex index 5c661658..0bcfb8d8 100644 --- a/docs/developers/version.tex +++ b/docs/developers/version.tex @@ -1 +1 @@ -1.38.11 (01 July 2006) +1.38.11 (24 July 2006) diff --git a/docs/home-page/pages/documentation.php b/docs/home-page/pages/documentation.php index 6f39e17a..7bc105f4 100644 --- a/docs/home-page/pages/documentation.php +++ b/docs/home-page/pages/documentation.php @@ -60,24 +60,6 @@ - - - - - - - - - - diff --git a/docs/manual-de/version.tex b/docs/manual-de/version.tex index 5c661658..0bcfb8d8 100644 --- a/docs/manual-de/version.tex +++ b/docs/manual-de/version.tex @@ -1 +1 @@ -1.38.11 (01 July 2006) +1.38.11 (24 July 2006) diff --git a/docs/manual/autochangerres.tex b/docs/manual/autochangerres.tex index 7cd3b87b..4150938e 100644 --- a/docs/manual/autochangerres.tex +++ b/docs/manual/autochangerres.tex @@ -29,9 +29,9 @@ will not work for Autochangers. resources that correspond to the autochanger drive. If you have a multiple drive autochanger, you must specify multiple Device names, each - one referring to a separate Device resource that contains a the + one referring to a separate Device resource that contains a Drive Index specification that corresponds to the drive - number. You may specify multiple device names on + number base zero. You may specify multiple device names on a single line separated by commas, and/or you may specify multiple Device directives. This directive is required. diff --git a/docs/manual/catmaintenance.tex b/docs/manual/catmaintenance.tex index e8558e94..f9bf6913 100644 --- a/docs/manual/catmaintenance.tex +++ b/docs/manual/catmaintenance.tex @@ -454,14 +454,17 @@ Schedule { # This is the backup of the catalog FileSet { Name = "Catalog" - Include = signature=MD5 { - @working_directory@/bacula.sql + Include { + Options { + signature=MD5 + } + File = \lt{}working_directory\gt{}/bacula.sql } } \end{verbatim} \normalsize -Be sure to write a bootstrap file as in the above example. It is preferable +Be sure to write a bootstrap file as in the above example. However, it is preferable to write or copy the bootstrap file to another computer. It will allow you to quickly recover the database backup should that be necessary. If you do not have a bootstrap file, it is still possible to recover your diff --git a/docs/manual/consoleconf.tex b/docs/manual/consoleconf.tex index 22f4864d..1eaa9c16 100644 --- a/docs/manual/consoleconf.tex +++ b/docs/manual/consoleconf.tex @@ -22,14 +22,6 @@ data types recognized by {\bf Bacula}, please see the The following Console Resource definition must be defined: -\begin{itemize} -\item - \ilink{Director}{DirectorResource3} -- to define the - Director's name and his access password. Note, you may define more than one -Director resource in the Console configuration file. If you do so, the -Console program will ask you which one you want to use. -\end{itemize} - \subsection*{The Director Resource} \label{DirectorResource3} \index[general]{Director Resource} diff --git a/docs/manual/firewalls.tex b/docs/manual/firewalls.tex index abe36a70..c3120c40 100644 --- a/docs/manual/firewalls.tex +++ b/docs/manual/firewalls.tex @@ -28,12 +28,12 @@ FD -> SD:9103 \end{verbatim} \normalsize -Where it should be obvious that DIR represents the Director, FD the File +Where hopefully it is obvious that DIR represents the Director, FD the File daemon or client, and SD the Storage daemon. The numbers that follow those names are the standard ports used by Bacula, and the -\gt{} represents the left side making a connection to the right side (i.e. the right side is the "server" or is listening on the specified port), and the left side is the -"client" who initiates the conversation. +"client" that initiates the conversation. Note, port 9103 serves both the Director and the File daemon, each having its own independent connection. @@ -64,8 +64,16 @@ Thanks to Raymond Norton for this tip. \index[general]{Concrete Example } \addcontentsline{toc}{subsection}{Concrete Example} -Jesse Guardiani's solution for his network for this problem, in his own words, -is: +The following discussion was originally written by +Jesse Guardiani because he has 'internal' and 'external' requiring the +Director and the Client to use different IP addresses. His original +solution was to define two different Storage resources in the Director's +conf file each pointing to the same Storage daemon but with different +IP addresses. In Bacula 1.38.x this no longer works, because Bacula makes +a 1 to 1 association between a Storage daemon resource and a Device (such +as an Autochanger). As a consequence, I have modified his original +text to a method that I believe will work, but is as of yet untested +(KES - July 2006). My bacula server is on the 192.168.1.0/24 network at IP address 192.168.1.52. For the sake of discussion we will refer to this network as the 'internal' @@ -181,42 +189,38 @@ server-sd. I have just *one* Device resource in my server-sd.conf file: \footnotesize \begin{verbatim} +Autochanger { + Name = "autochanger1";\ + Device = Drive0 + Changer Device = /dev/ch0; + Changer Command = "/usr/local/sbin/chio-bacula %c %o %S %a"; +} Device { - Name = "autochanger1"; + Name = Drive0 + DriveIndex = 0 Media Type = AIT-1; Archive Device = /dev/nrsa1; - Changer Device = /dev/ch0; - Changer Command = "/usr/local/sbin/chio-bacula %c %o %S %a"; Label Media = yes; AutoChanger = yes; AutomaticMount = yes; # when device opened, read it AlwaysOpen = yes; - Hardware End of Medium = No - Fast Forward Space File = No - BSF at EOM = yes + Hardware End of Medium = No + Fast Forward Space File = No + BSF at EOM = yes } \end{verbatim} \normalsize (note, please see \ilink{the Tape Testing}{FreeBSDTapes} chapter of this manual -for important FreeBSD information.) However, I have *two* Storage resources in -my server-dir.conf file: +for important FreeBSD information.) However, unlike previously, there +is only one Storage definition in my server-dir.conf file: \footnotesize \begin{verbatim} Storage { - Name = "autochanger1-int" # Storage device for backing up - Address = server.int.mydomain.tld - SDPort = 9103 - Password = "mysecretpassword" - Device = "autochanger1" - Media Type = AIT-1 - Autochanger = yes -} -Storage { - Name = "autochanger1-ext" # Storage device for backing up - Address = firewall.mydomain.tld + Name = "autochanger1" # Storage device for backing up + Address = Storage-server SDPort = 9103 Password = "mysecretpassword" Device = "autochanger1" @@ -226,13 +230,15 @@ Storage { \end{verbatim} \normalsize -Note that BOTH of the above server-dir.conf Storage resources use the same -'autochanger1' Device resource from server-sd.conf. +Note that the Storage resource uses neither of the two addresses to +the Storage daemon -- neither server.int.mydomain.tld nor +firewall.mydomain.tld, but instead uses the address Storage-server. + +What is key is that in the internal net, Storage-server is resolved +to server.int.mydomain.tld, either with an entry in /etc/hosts, or by +creating and appropriate DNS entry, and on the external net (the Client +machine), Storage-server is resolved to firewall.mydomain.tld. -My backup jobs run consecutively, one after the other, so only one of the -above Storage resources is being used by Bacula file daemons at any given -time. I don't know if this would cause problems at a site that runs more than -one backup in parallel to a single tape device. In addition to the above, I have two Client resources defined in server-dir.conf: @@ -289,10 +295,11 @@ Job { \normalsize It is important to notice that because the 'Private1-Backup' Job is intended -to back up a machine on the internal network it uses the 'autochanger1-int' -Storage resource. On the other hand, the 'Public1-Backup' Job is intended to -back up a machine on the external network, so it uses the 'autochanger1-ext' -Storage resource. +to back up a machine on the internal network so it resolves Storage-server +to contact the Storage daemon via the internal net. +On the other hand, the 'Public1-Backup' Job is intended to +back up a machine on the external network, so it resolves Storage-server +to contact the Storage daemon via the external net. I have left the Pool, Catalog, Messages, FileSet, Schedule, and Director resources out of the above server-dir.conf examples because they are not @@ -314,8 +321,8 @@ using server-sd then my understanding of the order of events is this: \item server-dir connects to private1-fd at private1.int.mydomain.tld:9102 \item server-dir tells private1-fd to start sending the files defined in the 'Private1-Backup' Job's FileSet resource to the Storage resource - 'autochanger1-int', which we have defined in server-dir.conf as having the -address:port of server.int.mydomain.tld:9103. + 'autochanger1', which we have defined in server-dir.conf as having the +address:port of Storage-server, which is mapped by DNS to server.int.mydomain.tld. \item private1-fd connects to server.int.mydomain.tld:9103 and begins sending files. \end{enumerate} @@ -333,8 +340,9 @@ this: public1.mydomain.tld:9102 \item server-dir tells public1-fd to start sending the files defined in the 'Public1-Backup' Job's FileSet resource to the Storage resource - 'autochanger1-ext', which we have defined in server-dir.conf as having the -address:port of firewall.mydomain.tld:9103. + 'autochanger1', which we have defined in server-dir.conf as having the + same address:port as above of Storage-server, but which on this machine + is resolved to firewall.mydomain.tld:9103. \item public1-fd connects to firewall.mydomain.tld:9103 and begins sending files. \end{enumerate} diff --git a/docs/manual/storedconf.tex b/docs/manual/storedconf.tex index b9862750..3c8fd697 100644 --- a/docs/manual/storedconf.tex +++ b/docs/manual/storedconf.tex @@ -407,7 +407,7 @@ specified within the Device resource are specific to the Device. The specified {\bf name-string} must be the {\bf generic SCSI} device name of the autochanger that corresponds to the normal read/write {\bf Archive Device} specified in the Device resource. This - gemeric SCSI device name should be specified if you have an autochanger + generic SCSI device name should be specified if you have an autochanger or if you have a standard tape drive and want to use the {\bf Alert Command} (see below). For example, on Linux systems, for an Archive Device name of {\bf /dev/nst0}, you would specify {\bf @@ -425,7 +425,7 @@ specified within the Device resource are specific to the Device. automatically change volumes as required by {\bf Bacula}. Normally, this directive will be specified only in the {\bf AutoChanger} resource, which is then used for all devices. However, you may also specify - the different {\bf Changer Commands} in each Device specification. + the different {\bf Changer Command} in each resource Device. Most frequently, you will specify the Bacula supplied {\bf mtx-changer} script as follows: @@ -446,7 +446,6 @@ Changer Command = "/path/mtx-changer %c %o %S %a %d" \item [Alert Command = {\it name-string}] \index[sd]{Alert Command} The {\bf name-string} specifies an external program to be called at the - \index[sd]{Directive!Changer Command} completion of each Job after the device is released. The purpose of this command is to check for Tape Alerts, which are present when something is wrong with your tape drive (at least for most modern tape drives). The same @@ -485,19 +484,19 @@ bacula-sd Alert: TapeAlert[32]: Interface: Problem with SCSI interface \item [Drive Index = {\it number}] \index[sd]{Drive Index} \index[sd]{Directive!Drive Index} - The {\bf Drive Index} that you specify is passed to the {\bf mtx-changer} - script and is thus passed to the {\bf mtx} program. By default, the Drive - Index is zero, so if you have only one drive in your autochanger, everything - will work normally. However, if you have multiple drives, you must specify t - multiple Bacula Device resources (one for each drive). - The first will either set Drive Index to zero, or - leave it unspecified, and the second Device Resource should contain a Drive - Index set to 1, and so on. This will then permit you to use two or more drives in your - autochanger. As of Bacula version 1.38.0, using the {\bf Autochanger} - resource, Bacula will automatically ensure that only one drive at a - time uses the autochanger script, so you no longer need locking scripts - as in the past -- the default mtx-changer script works for any number - of drives. + The {\bf Drive Index} that you specify is passed to the {\bf + mtx-changer} script and is thus passed to the {\bf mtx} program. By + default, the Drive Index is zero, so if you have only one drive in your + autochanger, everything will work normally. However, if you have + multiple drives, you must specify multiple Bacula Device resources (one + for each drive). The first Device should have the Drive Index set to 0, + and the second Device Resource should contain a Drive Index set to 1, + and so on. This will then permit you to use two or more drives in your + autochanger. As of Bacula version 1.38.0, using the {\bf Autochanger} + resource, Bacula will automatically ensure that only one drive at a time + uses the autochanger script, so you no longer need locking scripts as in + the past -- the default mtx-changer script works for any number of + drives. \item [Autoselect = {\it Yes|No}] \index[sd]{Autoselect} @@ -620,7 +619,7 @@ bacula-sd Alert: TapeAlert[32]: Interface: Problem with SCSI interface \item [Minimum block size = {\it size-in-bytes}] \index[sd]{Minimum block size} \index[sd]{Directive!Minimum block size} - On most modern tape drives, you will not need or wamt to specify this + On most modern tape drives, you will not need or want to specify this directive, and if you do so, it will be to make Bacula use fixed block sizes. This statement applies only to non-random access devices (e.g. tape drives). Blocks written by the storage daemon to a non-random @@ -633,9 +632,7 @@ bacula-sd Alert: TapeAlert[32]: Interface: Problem with SCSI interface access devices (tape drives), set the {\bf Minimum block size} and the {\bf Maximum block size} to the same value (zero included). The default is that both the minimum and maximum block size are zero and the default - block size is 64,512 bytes. If you wish the block size to be fixed and - different from the default, specify the same value for both {\bf Minimum - block size} and {\bf Maximum block size}. + block size is 64,512 bytes. For example, suppose you want a fixed block size of 100K bytes, then you would specify: @@ -672,7 +669,7 @@ bacula-sd Alert: TapeAlert[32]: Interface: Problem with SCSI interface \index[sd]{Directive!Maximum block size} On most modern tape drives, you will not need to specify this directive. If you do so, it will most likely be to use fixed block sizes (see - Minimum block size above). The Storage daemon will aways attempt to + Minimum block size above). The Storage daemon will always attempt to write blocks of the specified {\bf size-in-bytes} to the archive device. As a consequence, this statement specifies both the default block size and the maximum block size. The size written never exceed the given @@ -715,13 +712,13 @@ bacula-sd Alert: TapeAlert[32]: Interface: Problem with SCSI interface track of the file number on the tape and report it back correctly by the {\bf MTIOCGET} ioctl. Note, some SCSI drivers will correctly forward space, but they do not keep track of the file number or more seriously, they do not - report end of meduim. + report end of medium. Default setting for Fast Forward Space File is {\bf Yes}. \item [Use MTIOCGET = {\it Yes|No}] - \index[sd]{Fast Forward Space File} - \index[sd]{Directive!Fast Forward Space File} + \index[sd]{Use MTIOCGET} + \index[sd]{Directive!Use MTIOCGET} If {\bf No}, the operating system is not required to support keeping track of the file number and reporting it in the ({\bf MTIOCGET} ioctl). The default is {\bf Yes}. If you must set this to No, Bacula will do the proper file @@ -1047,7 +1044,7 @@ apply to removable filesystems such as USB in addition to DVD. If {\bf Yes} (the default), permits the daemon to examine the device to determine if it contains a Bacula labeled volume. This is done initially when the daemon is started, and then at the beginning of each - job. If the This directive is particularly important if you have set + job. This directive is particularly important if you have set {\bf Always Open = no} because it permits Bacula to attempt to read the device before asking the system operator to mount a tape. However, please note that the tape must be mounted before the job begins. diff --git a/docs/manual/version.tex b/docs/manual/version.tex index 5c661658..0bcfb8d8 100644 --- a/docs/manual/version.tex +++ b/docs/manual/version.tex @@ -1 +1 @@ -1.38.11 (01 July 2006) +1.38.11 (24 July 2006) -- 2.39.5