From bca9bdfd7db0d3c7e1f75e34d8d44735ee67233a Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 30 Jan 2007 19:36:20 +0000 Subject: [PATCH] Update --- docs/developers/version.tex | 2 +- docs/images/bat_icon.png | Bin 0 -> 5054 bytes docs/manual-de/update_version | 4 +-- docs/manual-de/version.tex | 2 +- docs/manual/dirdconf.tex | 56 ++++++++++++++++++++++++--------- docs/manual/filedconf.tex | 57 +++++++++++++++++++--------------- docs/manual/version.tex | 2 +- 7 files changed, 78 insertions(+), 45 deletions(-) create mode 100644 docs/images/bat_icon.png diff --git a/docs/developers/version.tex b/docs/developers/version.tex index 32b3e2a7..31a8ac64 100644 --- a/docs/developers/version.tex +++ b/docs/developers/version.tex @@ -1 +1 @@ -2.1.1 (18 January 2007) +2.0.2 (28 January 2007) diff --git a/docs/images/bat_icon.png b/docs/images/bat_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c017f9e0a9741860f49a057db4857d90641777be GIT binary patch literal 5054 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 UumaOBBme*a07*qoM6N<$f~PiWQ~&?~ literal 0 HcmV?d00001 diff --git a/docs/manual-de/update_version b/docs/manual-de/update_version index 5c2e0092..ecf019c0 100755 --- a/docs/manual-de/update_version +++ b/docs/manual-de/update_version @@ -3,8 +3,8 @@ # Script file to update the Bacula version # out=/tmp/$$ -VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' /home/kern/bacula/k/src/version.h` -DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' /home/kern/bacula/k/src/version.h` +VERSION=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' /home/kern/bacula/branch-2.0/src/version.h` +DATE=`sed -n -e 's/^.*[ \t]*BDATE.*"\(.*\)"$/\1/p' /home/kern/bacula/branch-2.0/src/version.h` . ./do_echo sed -f ${out} version.tex.in >version.tex rm -f ${out} diff --git a/docs/manual-de/version.tex b/docs/manual-de/version.tex index 32b3e2a7..31a8ac64 100644 --- a/docs/manual-de/version.tex +++ b/docs/manual-de/version.tex @@ -1 +1 @@ -2.1.1 (18 January 2007) +2.0.2 (28 January 2007) diff --git a/docs/manual/dirdconf.tex b/docs/manual/dirdconf.tex index 1314d170..047b40c8 100644 --- a/docs/manual/dirdconf.tex +++ b/docs/manual/dirdconf.tex @@ -681,7 +681,7 @@ For a {\bf Verify} Job, the Level may be one of the following: it will pipe the bootstrap record. It could for example be a shell script that emails you the bootstrap record. - On versions 1.39.22 or greater, before opening the file or execute the + On versions 1.39.22 or greater, before opening the file or executing the specified command, Bacula performs \ilink{character substitution}{character substitution} like in RunScript directive. To automatically manage your bootstrap files, you can use @@ -890,8 +890,8 @@ JobDefs { \index[dir]{RunScript} \index[dir]{Directive!Run Script} - This directive is only implemented in version 1.39.22 and later. - The RunScript directive behaves more like a resource in that it + This directive is implemented in version 1.39.22 and later. + The RunScript directive behaves like a resource in that it requires opening and closing braces around a number of directives that make up the body of the runscript. @@ -925,7 +925,7 @@ Command & & & Path to your script\\ Bacula job report. The command string must be a valid program name or name of a shell script. - In addition, the command string is parsed then fed to the execvp() function, + In addition, the command string is parsed then fed to the OS, which means that the path will be searched to execute your specified command, but there is no shell interpretation, as a consequence, if you invoke complicated commands or want any shell features such as redirection @@ -1002,15 +1002,21 @@ RunScript { {\bf Special Windows Considerations} In addition, for a Windows client on version 1.33 and above, please take - careful note that you must ensure a correct path to your script. The - script or program can be a .com, .exe or a .bat file. However, if you - specify a path, you must also specify the full extension. Unix like - commands will not work unless you have installed and properly configured - Cygwin in addition to and separately from Bacula. - + note that you must ensure a correct path to your script. The script or + program can be a .com, .exe or a .bat file. If you just put the program + name in then Bacula will search using the same rules that cmd.exe uses + (current directory, Bacula bin directory, and PATH). It will even try the + different extensions in the same order as cmd.exe. The command can be anything that cmd.exe or command.com will recognize - as an executable file. Specifying the executable's extension is - optional, unless there is an ambiguity. (i.e. ls.bat, ls.exe) + as an executable file. + + However, if you have slashes in the program name then Bacula figures you + are fully specifying the name, so you must also explicitly add the three + character extension. + + The command is run in a Win32 environment, so Unix like commands will not + work unless you have installed and properly configured Cygwin in addition + to and separately from Bacula. The System \%Path\% will be searched for the command. (under the environment variable dialog you have have both System Environment and @@ -1018,8 +1024,30 @@ RunScript { available to bacula-fd, if it is running as a service.) System environment variables can be referenced with \%var\% and - used as either part of the command name or arguments. + used as either part of the command name or arguments. + + So if you have a script in the Bacula\\bin directory then the following lines + should work fine: +\footnotesize +\begin{verbatim} + Client Run Before Job = systemstate +or + Client Run Before Job = systemstate.bat +or + Client Run Before Job = "systemstate" +or + Client Run Before Job = "systemstate.bat" +or + ClientRunBeforeJob = "\"C:/Program Files/Bacula/systemstate.bat\"" +\end{verbatim} +\normalsize + +The outer set of quotes is removed when the configuration file is parsed. +You need to escape the inner quotes so that they are there when the code +that parses the command line for execution runs so it can tell what the +program name is. + \footnotesize \begin{verbatim} @@ -1060,7 +1088,6 @@ ClientRunBeforeJob = "\"C:/Program Files/Software For Win32, please note that there are certain limitations: - ClientRunBeforeJob = "C:/Program Files/Bacula/bin/pre-exec.bat" Lines like the above do not work because there are limitations of @@ -1357,7 +1384,6 @@ will be sent to the Director. be rescheduled. The default is {\bf no} (i.e. the job will not be rescheduled). - This specification can be useful for portables, laptops, or other machines that are not always connected to the network or switched on. diff --git a/docs/manual/filedconf.tex b/docs/manual/filedconf.tex index 5b1ed7ee..0cbdb082 100644 --- a/docs/manual/filedconf.tex +++ b/docs/manual/filedconf.tex @@ -43,8 +43,8 @@ Director connections. \index[fd]{Client (or FileDaemon)} \index[fd]{Directive!Client (or FileDaemon)} Start of the Client records. There must be one and only one Client resource -in the configuration file, since it defines the properties of the current -client program. + in the configuration file, since it defines the properties of the current + client program. \item [Name = \lt{}name\gt{}] \index[fd]{Name} @@ -174,33 +174,40 @@ only IPv4 resolutions will be permitted, and likewise with ip6. \index[fd]{FDPort} \index[fd]{Directive!FDPort} This specifies the port number on which the Client listens for Director -connections. It must agree with the FDPort specified in the Client resource -of the Director's configuration file. The default is 9102. + connections. It must agree with the FDPort specified in the Client resource + of the Director's configuration file. The default is 9102. \item [FDAddress = \lt{}IP-Address\gt{}] \index[fd]{FDAddress} \index[fd]{Directive!FDAddress} This record is optional, and if it is specified, it will cause the File -daemon server (for Director connections) to bind to the specified {\bf -IP-Address}, which is either a domain name or an IP address specified as a -dotted quadruple. If this record is not specified, the File daemon will bind -to any available address (the default). + daemon server (for Director connections) to bind to the specified {\bf + IP-Address}, which is either a domain name or an IP address specified as a + dotted quadruple. If this record is not specified, the File daemon will bind + to any available address (the default). \item [SDConnectTimeout = \lt{}time-interval\gt{}] \index[fd]{SDConnectTimeout} \index[fd]{Directive!SDConnectTimeout} This record defines an interval of time that the File daemon will try to -connect to the Storage daemon. The default is 30 minutes. If no connection -is made in the specified time interval, the File daemon cancels the Job. + connect to the Storage daemon. The default is 30 minutes. If no connection + is made in the specified time interval, the File daemon cancels the Job. \item [Maximum Network Buffer Size = \lt{}bytes\gt{}] \index[fd]{Maximum Network Buffer Size} \index[fd]{Directive!Maximum Network Buffer Size} where \lt{}bytes\gt{} specifies the initial network buffer size to use with -the File daemon. This size will be adjusted down if it is too large until it -is accepted by the OS. Please use care in setting this value since if it is -too large, it will be trimmed by 512 bytes until the OS is happy, which may -require a large number of system calls. The default value is 32,768 bytes. + the File daemon. This size will be adjusted down if it is too large until it + is accepted by the OS. Please use care in setting this value since if it is + too large, it will be trimmed by 512 bytes until the OS is happy, which may + require a large number of system calls. The default value is 65,536 bytes. + + Note, on certain Windows machines, there are reports that the + transfer rates are very slow and this seems to be related to + the default 65,536 size. On systems where the transfer rates + seem abnormally slow compared to other systems, you might try + setting the Maximum Network Buffer Size to 32,768 in both the + File daemon and in the Storage daemon. \end{description} The following is an example of a valid Client resource definition: @@ -229,17 +236,17 @@ permitted to contact this Client. \index[fd]{Director} \index[fd]{Directive!Director} Start of the Director records. There may be any number of Director resources -in the Client configuration file. Each one specifies a Director that is -allowed to connect to this Client. + in the Client configuration file. Each one specifies a Director that is + allowed to connect to this Client. \item [Name = \lt{}name\gt{}] \index[fd]{Name} \index[fd]{Directive!Name} The name of the Director that may contact this Client. This name must be the -same as the name specified on the Director resource in the Director's -configuration file. Note, the case (upper/lower) of the characters in -the name are significant (i.e. S is not the same as s). This directive -is required. + same as the name specified on the Director resource in the Director's + configuration file. Note, the case (upper/lower) of the characters in + the name are significant (i.e. S is not the same as s). This directive + is required. \item [Password = \lt{}password\gt{}] \index[fd]{Password} @@ -252,12 +259,12 @@ resource in the Director's configuration file. This directive is required. \index[fd]{Monitor} \index[fd]{Directive!Monitor} If Monitor is set to {\bf no} (default), this director will have full access -to this Client. If Monitor is set to {\bf yes}, this director will only be -able to fetch the current status of this Client. + to this Client. If Monitor is set to {\bf yes}, this director will only be + able to fetch the current status of this Client. -Please note that if this director is being used by a Monitor, we highly -recommend to set this directive to {\bf yes} to avoid serious security -problems. + Please note that if this director is being used by a Monitor, we highly + recommend to set this directive to {\bf yes} to avoid serious security + problems. \end{description} Thus multiple Directors may be authorized to use this Client's services. Each diff --git a/docs/manual/version.tex b/docs/manual/version.tex index 32b3e2a7..31a8ac64 100644 --- a/docs/manual/version.tex +++ b/docs/manual/version.tex @@ -1 +1 @@ -2.1.1 (18 January 2007) +2.0.2 (28 January 2007) -- 2.39.5