From: <gi...@ba...> - 2013-01-06 12:22:47
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Bacula Community manual". The branch, Branch-5.2 has been updated via e52e77dde7c44205d779c805f9a075e4eb2954d8 (commit) via 3d21517becce065050040fdecdfb719d31654f7b (commit) via 168e73b51a96cf5a645c7cf843568220fac8b692 (commit) via 3a77cb954a4b9991fea930e6e08868fcad2fed33 (commit) via ecf97839d49c37e4e1fedebadeb211fa7144787d (commit) via f2e23e2a8540d70e60a138e3cecbb5f25e4d998a (commit) via 659e9a7f3a6f54e6b65024b5c0142066ca8a862f (commit) from ff00604edeb22b30fd7421945a0a31c5dc210126 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e52e77dde7c44205d779c805f9a075e4eb2954d8 Author: Kern Sibbald <ke...@si...> Date: Sun Jan 6 13:22:25 2013 +0100 Tweak .gitignore commit 3d21517becce065050040fdecdfb719d31654f7b Author: Kern Sibbald <ke...@si...> Date: Sat Jan 5 12:31:46 2013 +0100 Update .gitignore commit 168e73b51a96cf5a645c7cf843568220fac8b692 Author: Kern Sibbald <ke...@si...> Date: Fri Jan 4 22:41:12 2013 +0100 Tweak winbin.php page commit 3a77cb954a4b9991fea930e6e08868fcad2fed33 Author: Kern Sibbald <ke...@si...> Date: Fri Jan 4 22:27:21 2013 +0100 Delete links during make clean commit ecf97839d49c37e4e1fedebadeb211fa7144787d Author: Kern Sibbald <ke...@si...> Date: Fri Jan 4 22:03:55 2013 +0100 Pull in stuff from old-Branch-6.0 commit f2e23e2a8540d70e60a138e3cecbb5f25e4d998a Author: Philippe Chauvat <phi...@ba...> Date: Fri Jan 4 10:45:13 2013 +0100 Add README file to the manuals directory. commit 659e9a7f3a6f54e6b65024b5c0142066ca8a862f Author: Bastian Friedrich <bas...@co...> Date: Tue Dec 11 13:29:53 2012 +0100 Add restorejob documentation ----------------------------------------------------------------------- Summary of changes: diff --git a/docs/.gitignore b/docs/.gitignore index f38a767..aead2b5 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,72 +1,41 @@ -manuals/en/old/*/version.tex -manuals/en/old/*/bacula.sty -manuals/en/old/*/update_version -autom4te.cache -kernsconfig -*~ -*.~ -*.lof -*.lot -manuals/de/*/*.eps -manuals/es/*/*.eps -manuals/*/install/install -manuals/*/catalog/*.pdf -manuals/*/*.pdf -manuals/update_version -manuals/bacula.sty -manuals/version.tex -manuals/*/*.pdf -manuals/*/concepts/concepts -manuals/*/console/console -manuals/*/developers/developers -manuals/*/catalog/catalog -manuals/*/*/version.tex -manuals/*/*/bacula.sty -manuals/*/*/update_version -1 Makefile -autoconf/Make.common -bacula-web/Makefile -bacula-web/version.tex -config.log -config.out -config.status -manuals/bacula.sty -manuals/en/*/*.eps -*.aux -*.cdx -*.cnd -*.ddx -*.dnd +*/Makefile +*.sty *.dvi -*.fdx -*.fnd *.idx -*.ilg -*.ind -*.log -*.out -*.sdx -*.snd +*.maf *.toc -manuals/en/*.sty -manuals/*/install/installi-*.tex -manuals/*/catalog/catalogi-*.tex -manuals/*/concepts/concepts.pdf -manuals/*/concepts/conceptsi-*.tex +*.mtc* +*/version.tex +manuals/en/*/version.tex +manuals/*/*/version.tex +manuals/*/utility/utilityi* +manuals/*/misc/misci* +images/pdf +images/png +images/svg +images/eps +covers +manuals/*/console/consolei* +manuals/*/developers/developersi* +manuals/*/main/maini* +manuals/*/www-* +tools/wholemenu_* +config.* +autoconf/Make.common +autom4te.cache manuals/*/console/console.pdf -manuals/*/console/consolei-*.tex -manuals/*/developers/developersi-*.tex +manuals/*/console/console/ manuals/*/developers/developers.pdf -manuals/*/misc/misci-*.tex -manuals/*/misc/misc.pdf -manuals/*/misc/misc/ -manuals/*/main/maini-*.tex +manuals/*/developers/developers/ manuals/*/main/main.pdf manuals/*/main/main/ -manuals/*/install/install.pdf +manuals/*/misc/misc.pdf +manuals/*/misc/misc/ manuals/*/problems/problems.pdf manuals/*/problems/problems/ manuals/*/utility/utility.pdf manuals/*/utility/utility/ -manuals/*/utility/utilityi-*.tex +version.tex +bsysmanual +manuals/en/images diff --git a/docs/Makefile.in b/docs/Makefile.in index ed52176..9a1634a 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -109,6 +109,7 @@ $(basedir)/$(VERNAME).lsm: LSM.in $(srcdir)/../autoconf/Make.common.in $(srcdir) clean: $(RMF) *~ 1 2 3 bacula-doc*.tar.gz (cd bacula-web; make clean) + find . -type l -exec rm {} \; @for I in ${all_dirs}; \ do (cd $$I; echo "==>Entering directory `pwd`"; ${MAKE} $@ || exit 1); done diff --git a/docs/home-page/en/pages/home.php b/docs/home-page/en/pages/home.php index f234d05..c2a64a8 100644 --- a/docs/home-page/en/pages/home.php +++ b/docs/home-page/en/pages/home.php @@ -22,7 +22,7 @@ Bacula is by far the most popular Open Source program backup program. <br> <br> -<table width="759" border="0" cellspacing="2" cellpadding="0"> +<table width="900" border="0" cellspacing="2" cellpadding="0"> <tr> <td width="25"></td> <td><font size="5" color="#739ab9"> <strong>Bacula.org and Bacula Systems: @@ -34,7 +34,7 @@ </table> <p></p> -<table width="644" border="0" cellspacing="0" cellpadding="0" height="224"> +<table width="890" border="0" cellspacing="0" cellpadding="0" height="224"> <tr height="215"> <td align="center" valign="middle" width="331" height="215"> <table width="237" border="0" cellspacing="0" cellpadding="0"> @@ -102,12 +102,11 @@ </tr> <tr height="68"> <td height="68"> - <p>4 June 2012: <strong><a href="http://www.baculasystems.com/index.php?option=com_flexicontent&view=items&id=131:bacula-enterprise-edition&Itemid=15"> - Bacula Enterprise Edition 6.0.4 </a></strong> has been released.</p> + <p>December 2012: <strong><a href="http://www.baculasystems.com/index.php?option=com_flexicontent&view=items&id=131:bacula-enterprise-edition&Itemid=15"> + Bacula Enterprise Edition 6.0.6 </a></strong> has been released.</p> <p><strong>Bacula Adminstration I Training Course: <a href="http://www.baculasystems.com/index.php/component/content/article/211.html">dates announced</a><p> <p>See: <a href="http://www.baculasystems.com/index.php/company/recent-news.html">Bacula Systems News</a> <!-- -, or <a href="http://www.baculasystems.com/eng/Products/Enterprise-Edition"> Bacula Enterprise Edition main page</a></p> --> @@ -115,6 +114,65 @@ </tr> </table> </td> + +<!-- Louis note: start new columns --> + <td rowspan="2" width="25" height="229"> + <table width="3" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9" height="320"> + <tr height="60"> + <td height="60"></td> + </tr> + </table> + </td> + <td align="center" valign="middle" width="210" height="215"> + <table width="288" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td> + <table width="276" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9"> + <tr> + <td valign="top"> + <table width="264" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9"> + <tr height="50"> + <td width="5" height="50"></td> + <td width="271" height="50"> + <h4>Windows Binaries</h4> + </td> + </tr> + </table> + </td> + </tr> + </table> + </td> + </tr> + <tr height="10"> + <td height="10"></td> + </tr> + <tr height="68"> + <td height="68"> + +<p>If you are using the Bacula community version to back up and restore Windows +machines, it is now possible to purchase the Bacula Enterprise Windows +binaries <a href="http://www.baculasystems.com/windows-binaries-for-bacula-community-users"> + here</a>. These binaries allow you to continue +using Bacula community version as well as the lastest Windows binaries. +These binaries replace older Bacula community Windows File +daemons only (the Storage Daemon and Director binaries for Windows are not +available). An installer is available for both 32 and 64 bit machines. + +<b><a href="http://www.baculasystems.com/windows-binaries-for-bacula-community-users"> + +Windows binaries for Bacula community users + +</a></b> +</p> + <tr height="10"> + <td height="10"></td> + </tr> + </table> + </td> + + +<!-- Louis note: end now column --> + </tr> <tr align="center" height="14"> <td width="331" height="14"> @@ -131,6 +189,16 @@ </tr> </table> </td> +<!-- Louis note: begin line under the 3rd box --> +<td width="210" height="14"> + <table class="cellcolor" width="209" border="0" cellspacing="0" cellpadding="0" bgcolor="#739ab9" height="3"> + <tr height="3"> + <td width="209" height="3"></td> + </tr> + </table> + </td> + +<!-- Louis note: end line 3rd box --> </tr> </table> <p></p> diff --git a/docs/home-page/en/pages/winbin.php b/docs/home-page/en/pages/winbin.php new file mode 100644 index 0000000..b3d44b3 --- /dev/null +++ b/docs/home-page/en/pages/winbin.php @@ -0,0 +1,42 @@ +<? require_once("inc/header.php"); ?> +<table> +<tr> + <td class="contentTopic"> + Bacula Windows Binaries + </td> +</tr> +<tr> + <td class="content"> +<p> +As you are probably aware, the community Windows File daemon binaries are no +longer produced by the Bacula project. Consequently, as a service to the +community, Bacula Systems is offering its Windows Enterprise binaries at a +price that is designed to simply cover the costs to produce and distribute +those binaries. These Enterprise Windows binaries are compatible with the +community Director and Storage daemon. However, please note, that the Windows +Storage daemon and Director binaries are not provided. Included in this +package is an installer for both 32 and 64 bit machines. Support is not +offered by Bacula Systems, but is available through the Community Bugs +database. + </p> + <br> + <p> +In purchasing a license, by following the link below, you will +be able to download your Bacula Enterprise Windows binaries (32/64) +for a period of 6 months. During this time, if there are additional +releases, you may also download them. The license gives you the +right to use the downloaded Bacula Enterprise binaries with the +Bacula community version. This is a one time license fee that allows +you to continue using the downloaded binaries for as long as you respect +the terms of the license. After the 6 month download period, if you +want an updated Bacula Enterprise version, +you will need to purchase a new license. + <p> + <a href="http://www.baculasystems.com/windows-binaries-for-bacula-community-users"> + http://www.baculasystems.com/windows-binaries-for-bacula-community-users</a> + </p> + </td> +</tr> +</table> + +<? require_once("inc/footer.php"); ?> diff --git a/docs/kernsconfig b/docs/kernsconfig new file mode 100755 index 0000000..99ef251 --- /dev/null +++ b/docs/kernsconfig @@ -0,0 +1,3 @@ +#!/bin/sh +./configure --with-bacula=${HOME}/bacula/k/bacula +manuals/update_version diff --git a/docs/manuals/README b/docs/manuals/README new file mode 100644 index 0000000..61b3a28 --- /dev/null +++ b/docs/manuals/README @@ -0,0 +1,12 @@ +Philippe Chauvat - Bacula Systems S.A. +04-dec-2013 + +Q1 - How to include images? + The bacula.sty.in (and therefore the bacula.sty) file defines three + new LaTeX definitions: \bsysimageN, \bsysimageV and \bsysimageH + - N: stand for Normal, i.e. without any information regarding + the width or height or the image. It will be included "as is" + - V: stand for Vertical, i.e. the height of the image will be + constraint to 95% of the \linewidth LaTeX value + - H: stand for Horizontal, i.e. the widht of the image will be + constraint to 95% of the \linewidth LaTeX value \ No newline at end of file diff --git a/docs/manuals/en/console/bconsole.tex b/docs/manuals/en/console/bconsole.tex index 8861a22..c1637b7 100644 --- a/docs/manuals/en/console/bconsole.tex +++ b/docs/manuals/en/console/bconsole.tex @@ -962,6 +962,7 @@ release storage=\lt{}storage-name\gt{} restore storage=\lt{}storage-name\gt{} client=\lt{}backup-client-name\gt{} where=\lt{}path\gt{} pool=\lt{}pool-name\gt{} fileset=\lt{}fileset-name\gt{} restoreclient=\lt{}restore-client-name\gt{} + restorejob=\lt{}job-name\gt{} select current all done Where {\bf current}, if specified, tells the restore command to @@ -977,6 +978,12 @@ restore storage=\lt{}storage-name\gt{} client=\lt{}backup-client-name\gt{} if the restoreclient keyword is specified, then the restore is written to that client. + The restore job rarely needs to be specified, as bacula installations + commonly only have a single restore job configured. However, for certain + cases, such as a varying list of RunScript specifications, multiple + restore jobs may be configured. The restorejob argument allows the + selection of one of these jobs. + \item [run] \index[general]{run} This command allows you to schedule jobs to be run immediately. The full form diff --git a/docs/manuals/en/main/restore.tex b/docs/manuals/en/main/restore.tex index 855fe3d..8481e0f 100644 --- a/docs/manuals/en/main/restore.tex +++ b/docs/manuals/en/main/restore.tex @@ -631,6 +631,12 @@ The full list of possible command line arguments are: \item {\bf add\_suffix=.old} -- add a suffix to all your files. \item {\bf regexwhere=!a.pdf!a.bkp.pdf!} -- do complex filename manipulation like with sed unix command. Will overwrite other filename manipulation. +\item {\bf restorejob=jobname} -- Pre-chooses a restore job. Bacula can be + configured with multiple restore jobs ("Type = Restore" in the job + definition). This allows the specification of different restore properties, + including a set of RunScripts. When more than one job of this type is + configured, during restore, Bacula will ask for a user selection + interactively, or use the given restorejob. \end{itemize} \label{restorefilerelocation} diff --git a/docs/manuals/update_version b/docs/manuals/update_version new file mode 100755 index 0000000..86725c8 --- /dev/null +++ b/docs/manuals/update_version @@ -0,0 +1,10 @@ +#!/bin/sh +# +# Script file to update the Bacula version +# +out=/tmp/$$ +VERSION=`sed -n -e 's/^#define VERSION.*"\(.*\)"$/\1/p' /home/kern/bacula/k/bacula/src/version.h` +DATE=`sed -n -e 's/^#define BDATE.*"\(.*\)"$/\1/p' /home/kern/bacula/k/bacula/src/version.h` +. /home/kern/bacula/docs/docs/manuals/do_echo +sed -f ${out} /home/kern/bacula/docs/docs/manuals/version.tex.in >version.tex +rm -f ${out} diff --git a/docs/upload b/docs/upload new file mode 100755 index 0000000..0898378 --- /dev/null +++ b/docs/upload @@ -0,0 +1,41 @@ +#!/bin/sh +if [ $# != 1 ] ; then + echo "First argument must be language, e.g.: send en|es|de|fr" + echo " " + exit 1 +fi +cwd=`pwd` +lang=$1 +src=$cwd/manuals/${lang} +ver=5.2.12 +repo=release + +echo "ver=${ver}" + +# sendit src dest +sendit() +{ + for i in console developers main misc problems utility; do + echo " " + echo "Sending: $1/$i" + echo "To: $2/$i" + rsync -avz --delete --progress $1/$i/ $2/$i/ + rsync -avz --delete --progress $1/$i/$i.pdf $2/$i/ + done +} + +dest=bacula:/var/www/bacula/5.2.x-manuals/${lang} +echo "Sending to $dest" +sendit $src $dest + +dest=bsweb:/var/www/docs/5.2.x-manuals/${lang} +echo "Sending to $dest" +sendit $src $dest + +destdir=/home/frs/repo/htmldocs/${lang}/${ver} +dest=bsweb:${destdir} +ssh bsweb <<EOF +mkdir -p ${destdir} +EOF +echo "Sending to $dest" +sendit $src $dest hooks/post-receive -- Bacula Community manual |