diff --git a/manuals/en/main/bareos.sty b/manuals/en/main/bareos.sty index 04dcc67b7db..373972cc403 100644 --- a/manuals/en/main/bareos.sty +++ b/manuals/en/main/bareos.sty @@ -115,6 +115,10 @@ \newcommand{\bareosDeveloperGuideDotCommands}{% \developerGuide{dot-commands} } +\newcommand{\bareosDeveloperGuideApiModeJson}{% +\developerGuide{api-mode-2-json} +} + % % special characters diff --git a/manuals/en/main/install.tex b/manuals/en/main/install.tex index 729ac72a1b4..1bbe47a869d 100644 --- a/manuals/en/main/install.tex +++ b/manuals/en/main/install.tex @@ -78,21 +78,50 @@ \section{Install the Bareos Software Packages} \subsection{Install on RedHat based Linux Distributions} -\subsubsection{RHEL$\ge$6, CentOS$\ge$6, Fedora} +\subsubsection{RHEL$\ge$7, CentOS$\ge$7, Fedora} \index[general]{Platform!RHEL} \index[general]{Platform!CentOS} \index[general]{Platform!Fedora} -\begin{commands}{Bareos installation on RHEL $\ge$ 6 / CentOS $\ge$ 6 / Fedora} +Bareos \sinceVersion{dir}{requires!jansson}{15.2.0} requires the \ilink{Jansson library}{jansson} package. +On RHEL 7 it is available through the RHEL Server Optional channel. On CentOS 7 and Fedora is it included on the main repository. + +\begin{commands}{Bareos installation on RHEL $\ge$ 7 / CentOS $\ge$ 7 / Fedora} # # define parameter # DIST=RHEL_7 # or -# DIST=RHEL_6 -# DIST=Fedora_20 +# DIST=Fedora_22 # DIST=CentOS_7 + +DATABASE=postgresql +# or +# DATABASE=mysql + +# add the Bareos repository +URL=http://download.bareos.org/bareos/release/latest/$DIST +wget -O /etc/yum.repos.d/bareos.repo $URL/bareos.repo + +# install Bareos packages +yum install bareos bareos-database-$DATABASE +\end{commands} +\hide{$} + +\subsubsection{RHEL 6, CentOS 6} +\index[general]{Platform!RHEL!6} +\index[general]{Platform!CentOS!6} + +Bareos \sinceVersion{dir}{requires!jansson}{15.2.0} requires the \ilink{Jansson library}{jansson} package. +This package is available on \elink{EPEL}{https://fedoraproject.org/wiki/EPEL} 6. Make sure, it is available on your system. + +\begin{commands}{Bareos installation on RHEL $\ge$ 6 / CentOS $\ge$ 6} +# +# define parameter +# + +DIST=RHEL_6 # DIST=CentOS_6 DATABASE=postgresql @@ -151,7 +180,10 @@ \subsubsection{SUSE Linux Enterprise Server (SLES), openSUSE} DIST=SLE_12 # or +# DIST=SLE_11_SP4 # DIST=SLE_11_SP3 +# DIST=openSUSE_Leap_42.1 +# DIST=openSUSE_13.2 # DIST=openSUSE_13.1 DATABASE=postgresql @@ -175,6 +207,9 @@ \subsubsection{Debian / Ubuntu} \index[general]{Platform!Debian} \index[general]{Platform!Ubuntu} +Bareos \sinceVersion{dir}{requires!jansson}{15.2.0} requires the \ilink{Jansson library}{jansson} package. +On Ubuntu is it available in Ubuntu Universe. In Debian, is it included in the main repository. + \begin{commands}{Bareos installation on Debian / Ubuntu} # # define parameter @@ -183,7 +218,6 @@ \subsubsection{Debian / Ubuntu} DIST=Debian_8.0 # or # DIST=Debian_7.0 -# DIST=Debian_6.0 # DIST=xUbuntu_14.04 # DIST=xUbuntu_12.04 diff --git a/manuals/en/main/programs.tex b/manuals/en/main/programs.tex index ef1892ee290..98a2e547828 100644 --- a/manuals/en/main/programs.tex +++ b/manuals/en/main/programs.tex @@ -193,6 +193,9 @@ \subsection{bconsole} There is an own chapter on \command{bconsole}. Please refer to chapter \nameref{sec:bconsole}. +\subsection{bareos-webui} + +See \nameref{sec:webui}. \subsection{bat} \index[general]{Command!bat} diff --git a/manuals/en/main/requirements.tex b/manuals/en/main/requirements.tex index 496f21d606e..f96647cc531 100644 --- a/manuals/en/main/requirements.tex +++ b/manuals/en/main/requirements.tex @@ -10,8 +10,8 @@ \chapter{System Requirements} \item The minimum versions for each of the databases supported by Bareos are: \begin{itemize} - \item MySQL 4.1 \item PostgreSQL 8.4 (since Bareos 13.2.3) + \item MySQL 4.1 or compatible fork (e.g. MariaDB) \item SQLite 3 \end{itemize} \item Windows release is cross-compiled on Linux @@ -20,4 +20,9 @@ \chapter{System Requirements} \item The source code has been written with portability in mind and is mostly POSIX compatible. Thus porting to any POSIX compatible operating system should be relatively easy. +\item Jansson library: + \label{jansson} + \index[general]{JSON} + \index[general]{Jansson!\see{JSON}} + Bareos \sinceVersion{dir}{requires!jansson}{15.2.0} offers a JSON API mode, see \bareosDeveloperGuideApiModeJson. On some platform, the Jansson library is directory available. On others it can easly be added. For some older platforms, we compile Bareos without JSON API mode. \end{itemize} diff --git a/manuals/en/main/webui.tex b/manuals/en/main/webui.tex index 0ee9e8c9a8a..7a3ef49e2b6 100644 --- a/manuals/en/main/webui.tex +++ b/manuals/en/main/webui.tex @@ -16,11 +16,11 @@ \chapter{Installing Bareos Webui} \section{System Requirements} \begin{itemize} -\item A working Bareos environment, Bareos $>$= 15.2 +\item A working Bareos environment, Bareos $>$= 15.2.2, including JSON API mode, see \ilink{jansson}{jansson}. \item A Bareos platform, where bareos-webui packages are provided. \item An Apache 2.x Webserver with mod-rewrite, mod-php5 and mod-setenv \item PHP $>$= 5.3.3 -\item Zend Framework 2.2.x or later +\item Zend Framework 2.2.x or later. \textbf{Note:} Unfortunately, not all distributions offer a Zend Framework 2 package. The following list shows where to get the Zend Framework 2 package. \begin{itemize}