cleanup

manuals/en/main/consoleconf.tex

@@ -156,34 +156,32 @@ \section{Console Resource}
 \input{bconsole-resource-console-definitions.tex}
 \input{autogenerated/bconsole-resource-console-description.tex}
 
+\section{Example Console Configuration File}
+\index[general]{File!Example Console Configuration}
+\index[general]{Configuration!bconsole}
+
 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 bwx-console.conf file):
+example, if we define the following in the user's bconsole.conf file:
 
-\footnotesize
-\begin{verbatim}
+\begin{bconfig}{}
 Director {
    Name = MyDirector
-   DIRport = 9101
    Address = myserver
-   Password = "XXXXXXXXXXX"    # no, really.  this is not obfuscation.
+   Password = "XXXXXXXXXXX"
 }
 
-
 Console {
    Name = restricted-user
    Password = "UntrustedUser"
 }
-\end{verbatim}
-\normalsize
+\end{bconfig}
 
 Where the Password in the Director section is deliberately incorrect, and the
 Console resource is given a name, in this case {\bf restricted-user}. Then
 in the Director's bareos-dir.conf file (not directly accessible by the user),
 we define:
 
-\footnotesize
-\begin{verbatim}
+\begin{bconfig}{}
 Console {
   Name = restricted-user
   Password = "UntrustedUser"
@@ -196,8 +194,8 @@ \section{Console Resource}
   CatalogACL = DefaultCatalog
   CommandACL = run
 }
-\end{verbatim}
-\normalsize
+\end{bconfig}
+
 
 the user logging into the Director from his Console will get logged in as {\bf
 restricted-user}, and he will only be able to see or access a Job with the
@@ -211,18 +209,15 @@ \section{Console Resource}
 The following is an example of a bconsole.conf file that can access
 several Directors and has different Consoles depending on the director:
 
-\footnotesize
-\begin{verbatim}
+\begin{bconfig}{}
 Director {
    Name = MyDirector
-   DIRport = 9101
    Address = myserver
    Password = "XXXXXXXXXXX"    # no, really.  this is not obfuscation.
 }
 
 Director {
    Name = SecondDirector
-   DIRport = 9101
    Address = secondserver
    Password = "XXXXXXXXXXX"    # no, really.  this is not obfuscation.
 }
@@ -238,14 +233,12 @@ \section{Console Resource}
    Password = "A different UntrustedUser"
    Director = SecondDirector
 }
-\end{verbatim}
-\normalsize
+\end{bconfig}
 
 The second Director referenced at "secondserver" might look
 like the following:
 
-\footnotesize
-\begin{verbatim}
+\begin{bconfig}{}
 Console {
   Name = restricted-user
   Password = "A different UntrustedUser"
@@ -259,34 +252,18 @@ \section{Console Resource}
   CommandACL = run, restore
   WhereACL = "/"
 }
-\end{verbatim}
-\normalsize
-
-
-
-\section{Console Commands}
-\index[general]{Console Commands}
-\index[general]{Commands!Console}
-
-For more details on running the console and its commands, please see the
-\nameref{sec:bconsole} chapter of this manual.
-
-\section{Example Console Configuration File}
-\index[general]{File!Example Console Configuration}
-\index[general]{Configuration!bconsole}
+\end{bconfig}
 
 
 An example Console configuration file might be the following:
 
-\footnotesize
-\begin{verbatim}
+\begin{bconfig}{}
 #
 # Bareos Console Configuration File
 #
 Director {
-  Name = HeadMan
-  address = "my_machine.my_domain.com"
-  Password = Console_password
+  Name = "bareos.example.com-dir"
+  address = "bareos.example.com"
+  Password = "PASSWORD"
 }
-\end{verbatim}
-\normalsize
+\end{bconfig}