From b00ccd88813cec698eed9205a30d621558dc6d37 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 2 Jul 2012 09:42:23 +0200
Subject: [PATCH] Add documentation for FDStorageAddress

---
 docs/manuals/en/main/dirdconf.tex      | 34 +++++++++++++++++
 docs/manuals/en/main/newbsfeatures.tex | 53 +++++++++++++++++++++++++-
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/docs/manuals/en/main/dirdconf.tex b/docs/manuals/en/main/dirdconf.tex
index 9b2f379f..2b46430a 100644
--- a/docs/manuals/en/main/dirdconf.tex
+++ b/docs/manuals/en/main/dirdconf.tex
@@ -2383,6 +2383,25 @@ The speed parameter specifies the maximum allowed bandwidth that a job may use
 when started for this Client. The speed parameter should be specified in
 k/s, Kb/s, m/s or Mb/s.
 
+% \item [FD Storage Address = \lt{}address\gt{}] 
+%    \index[dir]{FDStorageAddress}
+%    \index[dir]{Directive!FD Storage Address}
+%    \index[dir]{Storage daemon Address} 
+% 
+%    Where the address is a host name, a {\bf fully qualified domain name}, or an
+%    {\bf IP address}. Please note that the \lt{}address\gt{} as specified here
+%    will be transmitted to the File daemon instead of the Storage
+%    \texttt{Address} who will then use it to contact the Storage daemon. This
+%    directive can be used in NAT environment where the configuration of the
+%    Client resolver is not possible. Note that using this directive will not allow
+%    to use multiple Storage Daemon for Backup/Restore jobs.
+% 
+% \begin{figure}[htbp]
+%   \centering
+%   \includegraphics[width=10cm]{\idir BackupOverWan1}
+%   \caption{Backup over WAN using FD Storage Address}
+% \end{figure}
+
 \item [Priority = \lt{}number\gt{}]
    \index[dir]{Priority}
    \index[dir]{Directive!Priority}
@@ -2438,6 +2457,21 @@ the Director.
    the  name but rather a fully qualified machine name or an IP address.  This
    directive is required. 
 
+ \item [FD Storage Address = \lt{}address\gt{}] \index[dir]{FDStorageAddress}
+   \index[dir]{Directive!FD Storage Address} \index[dir]{Storage daemon
+     Address} Where the address is a host name, a {\bf fully qualified domain
+     name}, or an {\bf IP address}. Please note that the \lt{}address\gt{} as
+   specified here will be transmitted to the File daemon instead of the
+   \texttt{Address} who will then use it to contact the Storage daemon. This
+   directive can be used in NAT environment where the configuration of the
+   Client resolver is not possible.
+
+\begin{figure}[htbp]
+  \centering
+  \includegraphics[width=10cm]{\idir BackupOverWan1}
+  \caption{Backup over WAN using FD Storage Address}
+\end{figure}
+
 \item [SD Port = \lt{}port\gt{}]
    \index[dir]{SD Port}
    \index[dir]{Directive!SD Port}
diff --git a/docs/manuals/en/main/newbsfeatures.tex b/docs/manuals/en/main/newbsfeatures.tex
index 8bff2f3f..55175782 100644
--- a/docs/manuals/en/main/newbsfeatures.tex
+++ b/docs/manuals/en/main/newbsfeatures.tex
@@ -1,4 +1,4 @@
-\chapter{New Features in Bacula Enterprise 6.0}
+\chapter{New Features in Bacula Enterprise 6.0.x}
 This chapter presents the new features that have been added to the
 current Enterprise version of Bacula.
 These features are available only with a Bacula Systems subscription.
@@ -7,6 +7,57 @@ In addition to the features in this chapter, the Enterprise version
 will include the Community features described in the Community new Features
 chapter.
 
+\chapter{New Features in Bacula Enterprise 6.0.5}
+
+\section{FD Storage Address}
+
+When the Director is behind a NAT, in a WAN area, to connect to 
+% the FileDaemon or 
+the StorageDaemon, the Director uses an "external" ip address,
+and the FileDaemon should use an "internal" ip address to contact the
+StorageDaemon.
+
+The normal way to handle this situation is to use a canonical name such as
+"storage-server" that will be resolved on the Director side as the WAN address
+and on the Client side as the LAN address. This is now possible to configure
+this parameter using the new \texttt{FDStorageAddress} Storage 
+% or Client
+directive.
+
+\begin{figure}[htbp]
+  \centering
+  \includegraphics[width=10cm]{\idir BackupOverWan1}
+  \label{fig:fdstorageaddress}
+  \caption{Backup over WAN}
+\end{figure}
+
+\begin{verbatim}
+Storage {
+     Name = storage1
+     Address = 65.1.1.1
+     FD Storage Address = 10.0.0.1
+     SD Port 9103
+     ...
+}
+\end{verbatim}
+
+% # or in the Client resouce
+% 
+% Client {
+%      Name = client1
+%      Address = 65.1.1.2
+%      FD Storage Address = 10.0.0.1
+%      FD Port 9103
+%      ...
+% }
+% \end{verbatim}
+% 
+% Note that using the Client \texttt{FDStorageAddress} directive will not allow
+% to use multiple Storage Daemon, all Backup or Restore requests will be sent to
+% the specified \texttt{FDStorageAddress}.
+
+\chapter{New Features in Bacula Enterprise 6.0.0}
+
 \section{Incomplete Jobs}
 During a backup, if the Storage daemon experiences disconnection
 with the File daemon during backup (normally a comm line problem
-- 
2.39.5