Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
joergsteffens committed Jan 1, 2015
1 parent e36a7b3 commit abaf49e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 46 deletions.
3 changes: 3 additions & 0 deletions manuals/en/main/bareos-sd-resource-director-definitions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
}

\defDirective{Sd}{Director}{TLS Enable}{}{}{%
Bareos can be configured to encrypt all its network traffic.
Chapter \nameref{TlsDirectives} explains
how the Bareos components must be configured to use TLS.
}

\defDirective{Sd}{Director}{TLS Key}{}{}{%
Expand Down
32 changes: 12 additions & 20 deletions manuals/en/main/bareos-sd-resource-storage-definitions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
}

\defDirective{Sd}{Storage}{Auto XFlate On Replication}{}{13.4.0}{%
\label{storage-storage-autoxflateonreplication}%
This directive controls the \ilink{autoxflate-sd plugin}{plugin-autoxflate-sd}
plugin when replicating data inside one or
between two storage daemons (Migration/Copy Jobs). Normally the storage daemon will
Expand Down Expand Up @@ -148,30 +147,20 @@
\defDirective{Sd}{Storage}{SD Address}{}{}{%
This directive is optional, and if it is specified, it will cause the
Storage daemon server (for Director and File daemon 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 directive is not
to the specified IP-Address, which is either a domain name or an
IP address specified as a dotted quadruple.
If this and the \linkResourceDirective{Sd}{Storage}{SD Addresses} directives are not
specified, the Storage daemon will bind to any available address (the
default).
}

\defDirective{Sd}{Storage}{SD Addresses}{}{}{%
Specify the ports and addresses on which the Storage daemon will listen
for Director connections. Normally, the default is sufficient and you
do not need to specify this directive. Probably the simplest way to
explain how this directive works is to show an example:

\bconfigInput{config/SdStorageSdAdresses1.conf}

where ip, ip4, ip6, addr, and port are all keywords. Note, that the address
can be specified as either a dotted quadruple, or IPv6 colon notation, or as
a symbolic name (only in the ip specification). Also, port can be specified
as a number or as the mnemonic value from the /etc/services file. If a port
is not specified, the default will be used. If an ip section is specified,
the resolution can be made either by IPv4 or IPv6. If ip4 is specified, then
only IPv4 resolutions will be permitted, and likewise with ip6.

Using this directive, you can replace both the SDPort and SDAddress
directives shown below.
Specify the ports and addresses on which the Storage daemon will listen for Director connections.
Using this directive, you can replace both the
\linkResourceDirective{Sd}{Storage}{SD Port}
and
\linkResourceDirective{Sd}{Storage}{SD Address}
directives.
}

\defDirective{Sd}{Storage}{SD Connect Timeout}{}{}{%
Expand Down Expand Up @@ -213,6 +202,9 @@
}

\defDirective{Sd}{Storage}{TLS Enable}{}{}{%
Bareos can be configured to encrypt all its network traffic.
Chapter \nameref{TlsDirectives} explains
how the Bareos components must be configured to use TLS.
}

\defDirective{Sd}{Storage}{TLS Key}{}{}{%
Expand Down
4 changes: 2 additions & 2 deletions manuals/en/main/config/DirConsoleJobACL1.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
JobACL = "Backup client 1", "Backup client 2"
JobACL = "RestoreFiles"
JobACL = "Backup client 1", "Backup client 2"
JobACL = "RestoreFiles"
2 changes: 1 addition & 1 deletion manuals/en/main/config/SdDeviceUnmountCommand1.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Unmount Command = "/bin/umount %m"
Unmount Command = "/bin/umount %m"
22 changes: 0 additions & 22 deletions manuals/en/main/config/SdStorageSdAdresses1.conf

This file was deleted.

2 changes: 1 addition & 1 deletion manuals/en/main/plugins.tex
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ \subsection{autoxflate-sd}
autoxflate-sd.c: deflate ratio: 50.59%
\end{bmessage}
Additional \ilink{AutoXFlateOnReplication}{storage-storage-autoxflateonreplication} can be configured at the Storage resource.
Additional \linkResourceDirective{Sd}{Storage}{Auto XFlate On Replication} can be configured at the Storage resource.
\subsection{scsicrypto-sd}
Expand Down

0 comments on commit abaf49e

Please sign in to comment.