From 526b6d53e432a90c7f49072c9ec7fd59e0ea2eb3 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 24 Apr 2007 15:24:56 +0000 Subject: [PATCH] Update --- docs/manual-fr/console.tex | 2 +- docs/manual-fr/consoleconf.tex | 2 +- docs/manual-fr/install.tex | 10 +++++----- docs/manual-fr/quickstart.tex | 6 +++--- docs/manual-fr/tutorial.tex | 4 ++-- docs/manual-fr/win32.tex | 2 +- docs/manual/console.tex | 2 +- docs/manual/consoleconf.tex | 2 +- docs/manual/install.tex | 10 +++++----- docs/manual/progs.tex | 24 +++++++++++++++++++++--- docs/manual/quickstart.tex | 6 +++--- docs/manual/tls.tex | 19 ++++++++++++++++--- docs/manual/tutorial.tex | 4 ++-- docs/manual/win32.tex | 9 +++++---- 14 files changed, 67 insertions(+), 35 deletions(-) diff --git a/docs/manual-fr/console.tex b/docs/manual-fr/console.tex index f4cccc98..13191937 100644 --- a/docs/manual-fr/console.tex +++ b/docs/manual-fr/console.tex @@ -22,7 +22,7 @@ Actuellement, la console Bacula existe en deux versions : une interface shell pouvez d\'eterminer l'\'etat d'un job particulier, examiner le contenu du catalogue et effectuer certaines manipulations de cartouches. -Il existe d'autre part un programme nomm\'e wx-console, b\^atie avec wxWidgets qui +Il existe d'autre part un programme nomm\'e bwx-console, b\^atie avec wxWidgets qui offre une interface graphique aux op\'erations de restauration. Etant donn\'e que la Console interagit avec le Director au travers du r\'eseau, diff --git a/docs/manual-fr/consoleconf.tex b/docs/manual-fr/consoleconf.tex index 6e651e3e..5a39be3a 100644 --- a/docs/manual-fr/consoleconf.tex +++ b/docs/manual-fr/consoleconf.tex @@ -178,7 +178,7 @@ ou un utilisateur pour qu'ils ne voient que les informations relatives \`a ses jobs ou \`a sa machine cliente. L'exemple ci-dessous nous a \'et\'e fournit par Phil Stracchino. Si nous -d\'efinissons ce qui suit dans le fichier bconsole.conf (ou wx-console.conf) +d\'efinissons ce qui suit dans le fichier bconsole.conf (ou bwx-console.conf) d'un utilisateur : \footnotesize diff --git a/docs/manual-fr/install.tex b/docs/manual-fr/install.tex index 191610f9..b1b26970 100644 --- a/docs/manual-fr/install.tex +++ b/docs/manual-fr/install.tex @@ -611,10 +611,10 @@ param\`etre est utilis\'e lors de la compilation de Bacula. cette option pour utiliser la Console graphique GNOME. Vous trouverez les binaires dans le r\'epertoire {\bf src/gnome-console}. -\item [{-}{-}enable-wx-console ] - \index[general]{{-}{-}enable-wx-console } +\item [{-}{-}enable-bwx-console ] + \index[general]{{-}{-}enable-bwx-console } Si vous avez install\'e wxWidgets sur votre ordinateur, vous devez -sp\'ecifier cette option pour utiliser la Console graphique wx-console. Vous +sp\'ecifier cette option pour utiliser la Console graphique bwx-console. Vous trouverez les binaires dans le r\'epertoire {\bf src/wx-console}. Ceci peut \^etre utile aux utilisateurs qui veulent une Console graphique, mais ne souhaitent pas installer Gnome, car wxWidgets peut fonctionner avec les @@ -1454,8 +1454,8 @@ query.sql bsmtp startmysql stopmysql -wx-console -wx-console.conf +bwx-console +bwx-console.conf \end{verbatim} \normalsize diff --git a/docs/manual-fr/quickstart.tex b/docs/manual-fr/quickstart.tex index 935f3694..d0b031fe 100644 --- a/docs/manual-fr/quickstart.tex +++ b/docs/manual-fr/quickstart.tex @@ -155,8 +155,8 @@ Si vous avez choisi de construire la Console GNOME avec l'option {\bf d\'efaut, nomm\'e {\bf gnome-console.conf}. Il en va de m\^eme pour la console wxWidgets, qui est construite par l'option -{\bf \verb{--{enable-wx-console}, et le nom du fichier de configuration par d\'efaut -est, dans ce cas, {\bf wx-console.conf}. +{\bf \verb{--{enable-bwx-console}, et le nom du fichier de configuration par d\'efaut +est, dans ce cas, {\bf bwx-console.conf}. Normalement, pour les nouveaux utilisateurs, aucune modification n'est requise pour ces fichiers. Les @@ -295,7 +295,7 @@ cd ./bacula-sd -t -c bacula-sd.conf ./bconsole -t -c bconsole.conf ./gnome-console -t -c gnome-console.conf -./wx-console -t -c wx-console.conf +./bwx-console -t -c wx-console.conf su -c "./bacula-tray-monitor -t -c tray-monitor.conf" \end{verbatim} \normalsize diff --git a/docs/manual-fr/tutorial.tex b/docs/manual-fr/tutorial.tex index 348b006a..a2c7d1aa 100644 --- a/docs/manual-fr/tutorial.tex +++ b/docs/manual-fr/tutorial.tex @@ -140,11 +140,11 @@ de la commande configure, vous pouvez aussi utiliser la console GNOME en tapant ./gnome-console -Vous pouvez aussi utiliser le programme wxWidgets {\bf wx-console}. +Vous pouvez aussi utiliser le programme wxWidgets {\bf bwx-console}. Pour simplifier, nous ne d\'ecrirons ici que le programme {\bf ./bconsole}. La plus grande partie de ce qui est d\'ecrit ici s'applique aussi aux programmes {\bf ./gnome-console} -et {\bf wx-console}. +et {\bf bwx-console}. La commande {\bf ./bconsole} lance le programme Console, qui se connecte au Director. Bacula \'etant un programme r\'eseau, vous pouvez utiliser la Console depuis n'importe quelle diff --git a/docs/manual-fr/win32.tex b/docs/manual-fr/win32.tex index bd7b6900..f467edcd 100644 --- a/docs/manual-fr/win32.tex +++ b/docs/manual-fr/win32.tex @@ -650,7 +650,7 @@ Include and Exclude directives. \index[general]{Unicode} Bacula versions prior to 1.37.28 do not support Windows Unicode filenames. -As of that version, both {\bf bconsole} and {\bf wx-console} support Windows +As of that version, both {\bf bconsole} and {\bf bwx-console} support Windows Unicode filenames. There may still be some problems with multiple byte characters (e.g. Chinese, ...) where it is a two byte character but the displayed character is not two characters wide. diff --git a/docs/manual/console.tex b/docs/manual/console.tex index f202310b..73212fb3 100644 --- a/docs/manual/console.tex +++ b/docs/manual/console.tex @@ -18,7 +18,7 @@ users to interact with Bacula. You can determine the status of a particular job, examine the contents of the Catalog as well as perform certain tape manipulations with the Console program. -In addition, there is a wx-console built with wxWidgets that allows a graphic +In addition, there is a bwx-console built with wxWidgets that allows a graphic restore of files. As of version 1.34.1 it is in an early stage of development, but it already is quite useful. Unfortunately, it has not been enhanced for some time now. diff --git a/docs/manual/consoleconf.tex b/docs/manual/consoleconf.tex index e65f0a3e..a9012caa 100644 --- a/docs/manual/consoleconf.tex +++ b/docs/manual/consoleconf.tex @@ -211,7 +211,7 @@ restricted consoles as noted above. The following configuration files were supplied by Phil Stracchino. For example, if we define the following in the user's bconsole.conf file (or -perhaps the wx-console.conf file): +perhaps the bwx-console.conf file): \footnotesize \begin{verbatim} diff --git a/docs/manual/install.tex b/docs/manual/install.tex index 67559734..35651fb1 100644 --- a/docs/manual/install.tex +++ b/docs/manual/install.tex @@ -664,8 +664,8 @@ customize your installation. GNOME GUI Console interface to Bacula, you must specify this option. Doing so will build everything in the {\bf src/GNOME-console} directory. -\item [ {-}{-}enable-wx-console ] - \index[general]{{-}{-}enable-wx-console} +\item [ {-}{-}enable-bwx-console ] + \index[general]{{-}{-}enable-bwx-console} If you have wxWidgets installed on your computer and you want to use the wxWidgets GUI Console interface to Bacula, you must specify this option. Doing so will build everything in the {\bf src/wx-console} directory. @@ -1252,7 +1252,7 @@ CFLAGS="-g -Wall" \ --mandir=$HOME/bacula/bin \ --enable-smartalloc \ --enable-GNOME \ - --enable-wx-console \ + --enable-bwx-console \ --enable-tray-monitor \ --with-pid-dir=$HOME/bacula/bin/working \ --with-subsys-dir=$HOME/bacula/bin/working \ @@ -1464,8 +1464,8 @@ query.sql bsmtp startmysql stopmysql -wx-console -wx-console.conf +bwx-console +bwx-console.conf 9 man pages \end{verbatim} \normalsize diff --git a/docs/manual/progs.tex b/docs/manual/progs.tex index 31a2fd37..7ecd74bf 100644 --- a/docs/manual/progs.tex +++ b/docs/manual/progs.tex @@ -442,10 +442,11 @@ program. If you find yourself using this program, you have probably done something wrong. For example, the best way to recover a lost or damaged Bacula database is to reload the database from using the bootstrap file that -was written when you saved it. +was written when you saved it. -The {\bf bscan} program can be used to re-create a database (catalog) from -the backup information written to one or more Volumes. This is normally +The {\bf bscan} program can be used to re-create a database (catalog) +records from the backup information written to one or more Volumes. +This is normally needed only if one or more Volumes have been pruned or purged from your catalog so that the records on the Volume are no longer in the catalog, or for Volumes that you have archived. @@ -699,6 +700,23 @@ contained in the database is not saved to the tape. Nevertheless, the reconstruction is sufficiently complete, that you can run {\bf restore} against it and get valid results. +An interesting aspect of restoring a catalog backup using {\bf bscan} is +that the backup was made while Bacula was running and writing to a tape. At +the point the backup of the catalog is made, the tape Bacula is writing to +will have say 10 files on it, but after the catalog backup is made, there +will be 11 files on the tape Bacula is writing. This there is a difference +between what is contained in the backed up catalog and what is actually on +the tape. If after restoring a catalog, you attempt to write on the same +tape that was used to backup the catalog, Bacula will detect the difference +in the number of files registered in the catalog compared to what is on the +tape, and will mark the tape in error. + +There are two solutions to this problem. The first is possibly the simplest +and is to mark the volume as Used before doing any backups. The second is +to manually correct the number of files listed in the Media record of the +catalog. This procedure is documented elsewhere in the manual and involves +using the {\bf update volume} command in {\bf bconsole}. + \subsection{Using bscan to Correct the Volume File Count} \index[general]{Using bscan to Correct the Volume File Count} \index[general]{Count!Using bscan to Correct the Volume File Count} diff --git a/docs/manual/quickstart.tex b/docs/manual/quickstart.tex index eff11281..65030e48 100644 --- a/docs/manual/quickstart.tex +++ b/docs/manual/quickstart.tex @@ -135,8 +135,8 @@ If you choose to build the GNOME console with the {\bf for it, named {\bf GNOME-console.conf}. The same applies to the wxWidgets console, which is build with the {\bf -\verb:--:enable-wx-console} option, and the name of the default -configuration file is, in this case, {\bf wx-console.conf}. +\verb:--:enable-bwx-console} option, and the name of the default +configuration file is, in this case, {\bf bwx-console.conf}. Normally, for first time users, no change is needed to these files. Reasonable defaults are set. @@ -290,7 +290,7 @@ cd ./bacula-sd -t -c bacula-sd.conf ./bconsole -t -c bconsole.conf ./GNOME-console -t -c GNOME-console.conf -./wx-console -t -c wx-console.conf +./bwx-console -t -c bwx-console.conf su -c "./bacula-tray-monitor -t -c tray-monitor.conf" \end{verbatim} \normalsize diff --git a/docs/manual/tls.tex b/docs/manual/tls.tex index 931e60ee..32fdc9b8 100644 --- a/docs/manual/tls.tex +++ b/docs/manual/tls.tex @@ -79,8 +79,7 @@ and not in a client context. Common name attribute of allowed peer certificates. If this directive is specified, all server certificates will be verified against this list. This can be used to ensure that only the CA-approved Director may connect. -This directive may be specified more than once. It is not valid in a client -context. +This directive may be specified more than once. \item [TLS CA Certificate File = \lt{}Filename\gt{}] The full path and filename specifying a @@ -190,7 +189,10 @@ Note, this link may change. \index[general]{TLS Configuration Files} Landon has supplied us with the TLS portions of his configuration -files, which should help you setting up your own. +files, which should help you setting up your own. Note, this example +shows the directives necessary for a Director to Storage daemon session. +The technique is the same between the Director and the Client and +for bconsole to the Director. {\bf bacula-dir.conf} \footnotesize @@ -221,6 +223,17 @@ files, which should help you setting up your own. TLS Certificate = /usr/local/etc/ssl/bacula@backup1/cert.pem TLS Key = /usr/local/etc/ssl/bacula@backup1/key.pem } + + Client { + Name = backup1-fd + Address = server1.example.com + ... + + TLS Enable = yes + TLS Require = yes + TLS CA Certificate File = /usr/local/etc/ssl/ca.pem + } + \end{verbatim} \normalsize diff --git a/docs/manual/tutorial.tex b/docs/manual/tutorial.tex index 516d9a27..6ccc8740 100644 --- a/docs/manual/tutorial.tex +++ b/docs/manual/tutorial.tex @@ -136,11 +136,11 @@ you may use the GNOME Console program: ./gnome-console -Another possibility is to run the wxWidgets program {\bf wx-console}. +Another possibility is to run the wxWidgets program {\bf bwx-console}. For simplicity, here we will describe only the {\bf ./bconsole} program. Most of what is described here applies equally well to {\bf ./gnome-console} -and to {\bf wx-console} +and to {\bf bwx-console} The {\bf ./bconsole} runs the Bacula Console program, which connects to the Director daemon. Since Bacula is a network program, you can run the Console diff --git a/docs/manual/win32.tex b/docs/manual/win32.tex index 00b8e6d2..e80a474a 100644 --- a/docs/manual/win32.tex +++ b/docs/manual/win32.tex @@ -49,7 +49,7 @@ software, it should be very familiar to you. If you have a previous version Bacula (1.39.20 or lower) installed, you should stop the service, uninstall it, and remove the Bacula installation directory possibly saving your -bacula-fd.conf, bconsole.conf, and wx-console.conf files +bacula-fd.conf, bconsole.conf, and bwx-console.conf files for use with the new version you will install. The Uninstall program is normally found in {\bf c:\textbackslash{}bacula\textbackslash{}Uninstall.exe}. We also recommend that you completely remove the directory @@ -64,7 +64,7 @@ in c:\textbackslash{}Documents and Settings\textbackslash{}All Users\textbacksla In addition, the {\bf Start\-\gt{}All Programs\-\gt{}Bacula} menu item will be created during the installation, and on that menu, you will find items for editing the configuration files, displaying -the document, and starting wx-console or bconsole. +the document, and starting bwx-console or bconsole. Finally, proceed with the installation. @@ -774,14 +774,15 @@ Include and Exclude directives. \index[general]{Unicode} Bacula versions prior to 1.37.28 do not support Windows Unicode filenames. -As of that version, both {\bf bconsole} and {\bf wx-console} support Windows +As of that version, both {\bf bconsole} and {\bf bwx-console} support Windows Unicode filenames. There may still be some problems with multiple byte characters (e.g. Chinese, ...) where it is a two byte character but the displayed character is not two characters wide. \index[general]{Win32 Path Length Restriction} Path/filenames longer than 260 characters (up to 32,000) are supported -beginning with Bacula version 1.39.20. +beginning with Bacula version 1.39.20. Older Bacula versions support +only 260 character path/filenames. \section{Win32 Specific File daemon Command Line} \index[general]{Client!Win32 Specific File daemon Command Line Options} -- 2.39.5