LanAddress directive: cleanup

3 files changed, 46 insertions, 51 deletions

diff --git a/manuals/en/main/director-resource-client-definitions.tex b/manuals/en/main/director-resource-client-definitions.tex
index 5c62493..63455da 100644
--- a/manuals/en/main/director-resource-client-definitions.tex
+++ b/manuals/en/main/director-resource-client-definitions.tex
@@ -104,10 +104,19 @@ independently applied, so the smaller of the two takes precedence.
 The default is 180 days.
 }
 
+
+\defDirective{Dir}{Client}{Lan Address}{}{}{%
+This directive might be useful in network setups where the \bareosDir and \bareosSd need different addresses to communicate with the \bareosFd.
+
+For details, see \nameref{LanAddress}.
+
+This directive corresponds to \linkResourceDirective{Dir}{Storage}{Lan Address}.
+}
+
+
 \defDirective{Dir}{Client}{Maximum Bandwidth Per Job}{}{}{%
 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.
+when started for this Client.
 }
 
 \defDirective{Dir}{Client}{Maximum Concurrent Jobs}{}{}{%
@@ -243,18 +252,3 @@ Specifies the username that must be supplied when authenticating.
 Only used for the non Native protocols at the moment.
 
 }
-
-\defDirective{Dir}{Client}{Lan Address}{}{}{%
-This parameter is needed to support a network topology where client and storage are
-situated inside of a LAN,  but the Director is outside of that LAN in the internet
-and accesses SD and FD via SNAT or port forwarding.
-
-Only if this parameter is present in both the involved Client and Storage resources,
-the Director will send the specified IP address or hostname to the FD or SD (when
-using passive client).
-
-See chapter \nameref{LanAddress} for more details.
-
-}
-
-
diff --git a/manuals/en/main/director-resource-storage-definitions.tex b/manuals/en/main/director-resource-storage-definitions.tex
index 23af604..fa4babf 100644
--- a/manuals/en/main/director-resource-storage-definitions.tex
+++ b/manuals/en/main/director-resource-storage-definitions.tex
@@ -83,6 +83,15 @@ specified at the Director level.  It is implemented only on systems
 The default value is zero, which means no change is made to the socket.
 }
 
+
+\defDirective{Dir}{Storage}{Lan Address}{}{}{%
+This directive might be useful in network setups where the \bareosDir and \bareosFd need different addresses to communicate with the \bareosSd.
+
+For details, see \nameref{LanAddress}.
+
+This directive corresponds to \linkResourceDirective{Dir}{Client}{Lan Address}.
+}
+
 \defDirective{Dir}{Storage}{Maximum Bandwidth Per Job}{}{}{%
 }
 
@@ -228,17 +237,3 @@ For details, refer to chapter \nameref{TlsDirectives}.
 
 \defDirective{Dir}{Storage}{Username}{}{}{%
 }
-
-\defDirective{Dir}{Storage}{Lan Address}{}{}{%
-This parameter is needed to support a network topology where client and storage are
-situated inside of a LAN,  but the Director is outside of that LAN in the internet
-and accesses SD and FD via SNAT or port forwarding.
-
-Only if this parameter is present in both the involved Client and Storage resources,
-the Director will send the specified IP address or hostname to the FD or SD (when
-using passive client).
-
-See chapter \nameref{LanAddress} for more details.
-
-}
-
diff --git a/manuals/en/main/lanaddress.tex b/manuals/en/main/lanaddress.tex
index 206e3ad..5bb73fa 100644
--- a/manuals/en/main/lanaddress.tex
+++ b/manuals/en/main/lanaddress.tex
@@ -2,9 +2,9 @@
    \label{LanAddress}
    \index[general]{Lan Address}
 
-The \configdirective{Lan Address} configuration directive is needed to support a network
-topology where client and storage are situated inside of a LAN,  but the Director is
-outside of that LAN in the internet and accesses SD and FD via SNAT / port forwarding.
+Bareos supports network
+topologies where the \bareosFd and \bareosSd are situated inside of a LAN,  but the \bareosDir is
+outside of that LAN in the Internet and accesses the \bareosFd and \bareosSd via SNAT / port forwarding.
 
 Consider the following scheme:
 
@@ -30,63 +30,69 @@ Consider the following scheme:
    | FD_WAN   SD_WAN   |
    | .30         .40   |
    \___________________/
-   \end{commands}
+\end{commands}
 
-The director can access the FD\_LAN via the IP 8.8.8.10, which is
+The \bareosDir can access the \host{FD_LAN} via the IP 8.8.8.10, which is
 forwarded to the IP 10.0.0.10 inside of the LAN.
 
-The director can access the SD\_LAN via the IP 8.8.8.20 which is
+The \bareosDir can access the \host{SD_LAN} via the IP 8.8.8.20 which is
 forwarded to the IP 10.0.0.20 inside of the LAN.
 
-There is also a FD and a SD outside of the LAN, which have the IPs
+There is also a \bareosFd and a \bareosSd outside of the LAN, which have the IPs
 8.8.8.30 and 8.8.8.40
 
 All resources are configured so that the \configdirective{Address} directive gets the
-Address where the Director can reach the daemons.
+address where the \bareosDir can reach the daemons.
 
 Additionally, devices being in the LAN get the LAN address configured in
-the \configdirective{LanAddress} directive:
+the \configdirective{Lan Address} directive. The configuration looks as follows:
 
-The configuration looks as follows:
-
-\begin{bconfig}{bareos-dir.conf}
+\begin{bareosConfigResource}{bareos-dir}{client}{FD\_LAN}
 Client {
    Name = FD_LAN
    Address = 8.8.8.10
    LanAddress = 10.0.0.10
    ...
 }
+\end{bareosConfigResource}
 
+\begin{bareosConfigResource}{bareos-dir}{client}{SD\_LAN}
 Storage {
    Name = SD_LAN
    Address = 8.8.8.20
    LanAddress = 10.0.0.20
    ...
 }
+\end{bareosConfigResource}
 
+\begin{bareosConfigResource}{bareos-dir}{client}{FD\_WAN}
 Client {
    Name = FD_WAN
    Address = 8.8.8.30
    ...
 }
+\end{bareosConfigResource}
 
+\begin{bareosConfigResource}{bareos-dir}{client}{SD\_WAN}
 Storage {
    Name = SD_WAN
    Address = 8.8.8.40
    ...
 }
-\end{bconfig}
+\end{bareosConfigResource}
+
 
-This way, backups and restores from each FD using each SD are possible
+This way, backups and restores from each \bareosFd using each \bareosSd are possible
 as long as the firewall allows the needed network connections.
 
-The director simply checks if both the involved client and storage
-both have a \configdirective{LanAddress} configured.
+The \bareosDir simply checks if both the involved \bareosFd and \bareosSd
+both have a \configdirective{Lan Address}
+(\linkResourceDirective{Dir}{Client}{Lan Address} and \linkResourceDirective{Dir}{Storage}{Lan Address}) configured.
 
-In that case, the initiating daemon is ordered to connect to the \configdirective{LanAddress}
-instead of the \configdirective{Address}. (In active client mode, the FD connects to the SD, in
-passive client mode the SD connects to the FD).
+In that case, the initiating daemon is ordered to connect to the \configdirective{Lan Address}
+instead of the \configdirective{Address}. In active client mode, the \bareosFd connects to the \bareosSd, in
+passive client mode (see \nameref{PassiveClient}) the \bareosSd connects to the \bareosFd.
 
-If only one or none of the involved client and storage have a \configdirective{LanAddress}
+If only one or none of the involved \bareosFd and \bareosSd have a \configdirective{Lan Address}
 configured, the \configdirective{Address} is used as connection target for the
 initiating daemon.