Univention: adapt to bareos-16.2

manuals/en/main/operating-system-univention-corporate-server.tex

@@ -24,7 +24,12 @@ \subsubsection{Quick Start}
   \item Determine the space requirements and where to store your backup data
   \item Set the \parameter{bareos/*} UCR variables according to your needs, see \nameref{sec:UCR}
   \item Restart \command{bareos-dir}, \command{bareos-sd} and \command{bareos-fd} (or simply reboot the server)
-  \item Install the Bareos file daemon on clients and copy configuration file from \file{/etc/bareos/autogenerated/client-configs/<hostname>.conf}, see \nameref{sec:UniventionAddClient}
+  \item Install the Bareos file daemon on clients and copy Director configuration resource file from
+    \begin{itemize}
+        \item \file{/etc/bareos/bareos-dir-export/client/<clientname>-fd/bareos-fd.d/director/*.conf}
+        \item (or \file{/etc/bareos/autogenerated/client-configs/<hostname>.conf}, if Bareos $<$ 16.2.0)
+    \end{itemize}
+    For details, see \nameref{sec:UniventionAddClient}.
   \item Enable backup jobs for clients in the Univention Management Console
  \end{itemize}
 
@@ -236,11 +241,13 @@ \subsubsection{Add a client to the backup}
 \paragraph{Overview}
 
   \begin{itemize}
-    \item Install the Bareos client on the target system, see \ilink{Adding a Bareos Client}{SecondClient}
+    \item Install the Bareos client software on the target system, see \ilink{Adding a Bareos Client}{SecondClient}
     \item Use the Univention Management Console to add the client to the backup, see the screenshot below
-    \item Copy the filedaemon configuration file from the Univention server to the target system
+    \item Copy the filedaemon resource configuration file from the Univention server to the target system
   \end{itemize}
 
+\paragraph{Bareos $>=$ 16.2.4}
+
 \subparagraph{Server-side}
 
 The Univention Bareos application comes with an automatism for the client and job configuration. If you want to add a client to the Bareos director configuration, you need use the Univention Management Console, select the client you want to backup and set the \argument{enable backup job} checkbox to true, as shown in the screenshot below.
@@ -249,77 +256,99 @@ \subsubsection{Add a client to the backup}
   \includegraphics[width=0.8\textwidth]{\idir univention-client-job-activation}
 \end{center}
 
-If the name of the client is \name{testw1.example.com}, corresponding configuration files will be generated/adapted:
+If the name of the client is \name{testw1.example.com}, corresponding configuration files will be generated:
 \begin{itemize}
-  \item creates \file{/etc/bareos/autogenerated/fd-configs/testw1.example.com.conf}
-  \item creates \file{/etc/bareos/autogenerated/clients/testw1.example.com.include}
-  \item extends \file{/etc/bareos/autogenerated/clients.include}
+    \item \file{/etc/bareos/autogenerated/clients/testw1.example.com.include}
+    \item \file{/etc/bareos/bareos-dir-export/client/testw1.example.com-fd/bareos-fd.d/director/bareos-dir.conf}
 \end{itemize}
 
-The generated configuration files under \directory{/etc/bareos/autogenerated/fd-configs/} are intended for the target systems.
+Generated configuration files under \directory{/etc/bareos/bareos-dir-export/client/} are intended for the target systems.
 After you have \ilink{installed the Bareos client on the target system}{SecondClient},
-copy the generated client configuration over to the client and save it to 
+copy the generated client configuration over to the client and save it to following directories:
 \begin{itemize}
-    \item on Linux: \file{/etc/bareos/bareos-fd.conf}
-    \item on Windows: \file{C:\Program Files\Bareos\bareos-fd.conf}
+    \item on Linux: \path|/etc/bareos/bareos-fd.d/director/|
+    \item on Windows: \path|C:\Program Files\Bareos\bareos-fd.d/director/|
 \end{itemize}
 
 \begin{commands}{copy client configuration from the server to the testw1.example.com client (Linux)}
 root@ucs:~# <input>CLIENTNAME=testw1.example.com</input>
-root@ucs:~# <input>scp /etc/bareos/autogenerated/fd-configs/${CLIENTNAME}.conf root@${CLIENTNAME}:/etc/bareos/bareos-fd.conf</input>
+root@ucs:~# <input>scp /etc/bareos/bareos-dir-export/client/testw1.example.com${CLIENTNAME}-fd/bareos-fd.d/director/*.conf root@${CLIENTNAME}:/etc/bareos/bareos-fd.d/director/</input>
 \end{commands}
 
 
 \paragraph{Background}
 
-All clients will be listed in the \file{/etc/bareos/autogenerated/clients.include} which points to a \file{/etc/bareos/autogenerated/clients/xxx.conf}. If you disable the Bareos backup for a client, the client will not be removed from the configuration files. Only the backup job will be set inactive.
+The settings for each job resource are defined by the template files you see below:
 
-\begin{commands}{}
-root@ucs:/etc/bareos/autogenerated# <input>cat clients.include</input>
-@/etc/bareos/autogenerated/clients/testw4.example.com.include
-@/etc/bareos/autogenerated/clients/testw1.example.com.include
-@/etc/bareos/autogenerated/clients/testw2.example.com.include
-\end{commands}
+The files
+\begin{itemize}
+    \item \file{/etc/bareos/autogenerated/clients/generic.template}
+    \item \file{/etc/bareos/autogenerated/clients/windows.template}
+\end{itemize}
+are used as templates for new clients. For Windows clients the file \file{windows.template} is used, the \file{generic.template} is used for all other client types.
 
+%All clients will be listed in the \file{/etc/bareos/autogenerated/clients.include} which points to a \file{/etc/bareos/autogenerated/clients/xxx.conf}.
+
+If you disable the Bareos backup for a client, the client will not be removed from the configuration files. Only the backup job will be set inactive.
+
+If you add three client, your client directory will look similar to this:
 \begin{commands}{}
 root@ucs:/etc/bareos/autogenerated/clients# <input>ls -l</input>
 -rw-r--r-- 1 root root 430 16. Mai 15:15 generic.template
--rw-r----- 1 root bareos 518 21. Mai 14:49 testw2.example.com.include
--rw-r----- 1 root bareos 518 16. Mai 18:17 testw4.example.com.include
 -rw-r----- 1 root bareos 513 21. Mai 14:46 testw1.example.com.include
+-rw-r----- 1 root bareos 518 21. Mai 14:49 testw2.example.com.include
+-rw-r----- 1 root bareos 518 16. Mai 18:17 testw3.example.com.include
 -rw-r--r-- 1 root root 439 16. Mai 15:15 windows.template
 \end{commands}
 
-The settings for each job resource are set by the job definition from the bareos-director default configuration and the template files you see above.
 
-The files
-\begin{itemize}
-    \item \file{/etc/bareos/autogenerated/clients/generic.template}
-    \item \file{/etc/bareos/autogenerated/clients/windows.template}
-\end{itemize}
-are used as templates for new clients. For Windows clients the file \file{windows.template} is used, the \file{generic.template} is used for all other client types.
-
- The client configuration file contains, as you can see below, the connection information and the job information:
+The client configuration file contains, as you can see below, the client connection and the job information:
 
 \begin{commands}{}
 root@ucs:/etc/bareos/autogenerated/clients# <input>cat testw2.example.com.include</input>
 Client {
  Name = "testw2.example.com-fd"
  Address = "testw2.example.com"
  Password = "DBLtVnRKq5nRUOrnB3i3qAE38SiDtV8tyhzXIxqR"
- File Retention = 30 days # 30 days
- Job Retention = 6 months # six months
- AutoPrune = no # Prune expired Jobs/Files
 }
+
 Job {
- Name = "Backup-testw2.example.com" #job name
+ Name = "Backup-testw2.example.com" # job name
  Client = "testw2.example.com-fd" # client name
  JobDefs = "DefaultJob" # job definition for the job
  FileSet = "Windows All Drives" # FileSet (data which is backed up)
  Schedule = "WeeklyCycle" # schedule for the backup tasks
  Enabled = "Yes" #this is the ressource which is toggled on/off by enabling or disabling a backup from the univention gui
- }
+}
 \end{commands}
 
 % After having enabled the Bareos backup for a client on your Domaincontroller master, where usually your director- and storage-daemon are running, it will be configured automatically and loaded into the bareos-director configuration.
-Bareos comes with a special cronjob called \command{univention-bareos}, which performs a restart every day at 20:30 o'clock (Remember: backups will be started at 21:00 o'clock!) and safely reload the configuration.
+% Bareos comes with a special cronjob called \command{univention-bareos}, which performs a restart every day at 20:30 o'clock (Remember: backups will be started at 21:00 o'clock!) and safely reload the configuration.
+
+
+
+\paragraph{Bareos $<$ 16.2.0}
+
+Older versions of Bareos handle generating the client configuration similar,
+but not identical:
+
+If the name of the client is \name{testw1.example.com}, corresponding configuration files will be generated/adapted:
+\begin{itemize}
+  \item creates \file{/etc/bareos/autogenerated/fd-configs/testw1.example.com.conf}
+  \item creates \file{/etc/bareos/autogenerated/clients/testw1.example.com.include}
+  \item extends \file{/etc/bareos/autogenerated/clients.include}
+\end{itemize}
+
+Here the files intended for the target systems are generated under \directory{/etc/bareos/autogenerated/fd-configs/}
+and they do not only definr a director resource, but are full configuration files for the client.
+After you have \ilink{installed the Bareos client on the target system}{SecondClient},
+copy the generated client configuration over to the client and save it to 
+\begin{itemize}
+    \item on Linux: \path|/etc/bareos/bareos-fd.conf|
+    \item on Windows: \path|C:\Program Files\Bareos\bareos-fd.conf|
+\end{itemize}
+
+\begin{commands}{copy client configuration from the server to the testw1.example.com client (Linux)}
+root@ucs:~# <input>CLIENTNAME=testw1.example.com</input>
+root@ucs:~# <input>scp /etc/bareos/autogenerated/fd-configs/${CLIENTNAME}.conf root@${CLIENTNAME}:/etc/bareos/bareos-fd.conf</input>
+\end{commands}

manuals/en/main/releasenotes.tex

@@ -21,10 +21,14 @@ \section*{Bareos-16.2}
 \begin{tabular}{p{0.2\textwidth} p{0.8\textwidth}}
 Code Release      & TBD\\
 Database Version  & 2004 (unchanged)\\
-Release Ticket    & TBD\\
+Release Ticket    & \ticket{698}\\
 Url               & TBD\\
+%Url               & \releaseUrlDownloadBareosOrg{16.2} \\
+%                  & \releaseUrlDownloadBareosCom{16.2} \\
 \end{tabular}
 
+First stable release of the Bareos 16.2 branch.
+
 \begin{itemize}
 \item Configuration
      \begin{itemize}
@@ -43,7 +47,7 @@ \section*{Bareos-16.2}
      \end{itemize}
 \item \bareosWebui
      \begin{itemize}
-     \item While RHEL 6 and CentOS 6 are still platforms supported by Bareos, the package \package{bareos-webui} is not available for these platforms, as the required ZendFramework 2.4 do require PHP >= 5.3.23.
+     \item While RHEL 6 and CentOS 6 are still platforms supported by Bareos, the package \package{bareos-webui} is not available for these platforms, as the required ZendFramework 2.4 do require PHP $>=$ 5.3.17 (5.3.23).
      \end{itemize}
 \end{itemize}
 }

manuals/en/main/supportedoses.tex

@@ -138,18 +138,13 @@ \subsection{Debian.org / Ubuntu Universe}
 In the further text, these version will be named \name{Bareos (Debian.org)} 
 (also for the Ubuntu Universe version, as this is based on the Debian version).
 
-The source of these packages comes from a separate branch.
-For the release \name{bareos-14.2} this is
-\url{https://github.com/bareos/bareos/tree/bareos-14.2-debian} instead of the standard branch \url{https://github.com/bareos/bareos/tree/bareos-14.2}.
-
-The Bareos project tries to limit the differences between these branches to a minimum.
-
 \subsubsection{Limitations of the Debian.org/Ubuntu Universe version of Bareos}
 \label{sec:DebianOrgLimitations}
 
     \begin{itemize}
         \item Debian.org does not include the libfastlz compression library and therefore the Bareos (Debian.org) packages do not offer the fileset options \parameter{compression=LZFAST}, \parameter{compression=LZ4} and \parameter{compression=LZ4HC}.
         \item Debian.org prefers that Bareos (Debian.org) is linked against GnuTLS instead of OpenSSL. Therefore, the Bareos (Debian.org) package only support \nameref{sec:TransportEncryption} but no \nameref{DataEncryption}.
+        \item Debian.org does not include the \package{bareos-webui} package.
     \end{itemize}