Skip to content

Commit

Permalink
docs: Avoid duplicate label warnings
Browse files Browse the repository at this point in the history
(cherry picked from commit 968d6a8)
  • Loading branch information
pstorz committed Sep 28, 2021
1 parent 77c833c commit eb92443
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
8 changes: 4 additions & 4 deletions docs/manuals/source/TasksAndConcepts/CatalogMaintenance.rst
Expand Up @@ -150,8 +150,8 @@ To view and test the currently configured settings, use following commands:
25-Apr 16:25 bareos-dir ERROR TERMINATION
Please correct the configuration in /etc/bareos/bareos-dir.d/*/*.conf
PostgreSQL
^^^^^^^^^^
PostgreSQL configuration
^^^^^^^^^^^^^^^^^^^^^^^^

On most distributions, PostgreSQL uses ident to allow access to the database system. The database administrator account is the Unix user **postgres**. Normally, this user can access the database without password, as the ident mechanism is used to identify the user.

Expand Down Expand Up @@ -660,8 +660,8 @@ You can use the following Job resource in your nightly :config:option:`dir/job =
}
PostgreSQL
----------
PostgreSQL Database
-------------------

:index:`\ <single: Database; PostgreSQL>`\ :index:`\ <single: PostgreSQL>`\

Expand Down
44 changes: 22 additions & 22 deletions docs/manuals/source/TasksAndConcepts/Plugins.rst
Expand Up @@ -616,8 +616,8 @@ It is included in Bareos since :sinceVersion:`19: oVirt Plugin`.

.. _oVirtPlugin-status:

Status
^^^^^^
Status of oVirt Plugin
^^^^^^^^^^^^^^^^^^^^^^

The Plugin can currently only take full backups of VM disks because
the oVirt/RHV API does not yet provide methods for incremental backups.
Expand All @@ -641,8 +641,8 @@ of the engine server.

.. _oVirtPlugin-requirements:

Requirements
^^^^^^^^^^^^
Requirements of oVirt Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The plugin is currently only available for Red Hat Enterprise Linux 7 and CentOS 7. It requires the
Python oVirt Engine SDK version 4, Red Hat Subscriptions customers can find the package
Expand All @@ -659,17 +659,17 @@ QEMU GA provides VSS support thus live snapshots attempt to quiesce whenever pos

.. _oVirtPlugin-installation:

Installation
^^^^^^^^^^^^
Installation of oVirt Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The installation is done by installing the package **bareos-filedaemon-ovirt-python-plugin**:

:command:`yum install bareos-filedaemon-ovirt-python-plugin`

.. _oVirtPlugin-configuration:

Configuration
^^^^^^^^^^^^^
Configuration of oVirt Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

As the Plugin needs access to the oVirt API, an account with appropriate privileges must be used.
The default **admin@internal** user works, as it has all privileges. Using an account with
Expand Down Expand Up @@ -837,8 +837,8 @@ ovirt_sdk_debug_log

.. _oVirtPlugin-backup
Backup
^^^^^^
Backup with oVirt Plugin
^^^^^^^^^^^^^^^^^^^^^^^^

To manually run a backup, use the following command in |bconsole|:

Expand Down Expand Up @@ -871,8 +871,8 @@ To manually run a backup, use the following command in |bconsole|:

.. _oVirtPlugin-restore
Restore
^^^^^^^
Restore with oVirt Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^

An example restore dialogue could look like this:

Expand Down Expand Up @@ -1053,8 +1053,8 @@ The key features of XtraBackup are:
Incremental backups only work for INNODB tables, when using MYISAM, only full backups can be created.


Prerequisites
'''''''''''''
Prerequisites of percona XtraBackup Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Install the XtraBackup tool from Percona. Documentation and packages are available here: https://www.percona.com/software/mysql-database/percona-XtraBackup. The plugin was successfully tested with XtraBackup versions 2.3.5 and 2.4.4.

Expand All @@ -1063,13 +1063,13 @@ As it is a Python plugin, it will also require to have the package **bareos-file
For authentication the :file:`.mycnf` file of the user running the |fd| is used. Before proceeding, make sure that XtraBackup can connect to the database and create backups.


Installation
''''''''''''
Installation of percona XtraBackup Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Make sure you have met the prerequisites, after that install the package **bareos-filedaemon-percona_XtraBackup-python-plugin**.

Configuration
'''''''''''''
Configuration of percona XtraBackup Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Activate your plugin directory in the |fd| configuration. See :ref:`fdPlugins` for more about plugins in general.

Expand Down Expand Up @@ -1114,8 +1114,8 @@ You can append options to the plugin call as key=value pairs, separated by ’:

- :strong:`strictIncremental`: By default (false), an incremental backup will create data, even if the Log Sequence Number (LSN) wasn’t increased since last backup. This is to ensure, that eventual changes to MYISAM tables get into the backup. MYISAM does not support incremental backups, you will always get a full bakcup of these tables. If set to true, no data will be written into backup, if the LSN wasn’t changed.

Restore
'''''''
Restore with percona XtraBackup Plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

With the usual Bareos restore mechanism a file-hierarchy will be created on the restore client under the default restore location:

Expand Down Expand Up @@ -1276,8 +1276,8 @@ The volume label is unencrypted, so a volume can also be recognized by a non-enc

.. _configuration-1:

Configuration
^^^^^^^^^^^^^
Configuration of the scsicrypto-sd plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

SCSI crypto setup
'''''''''''''''''
Expand Down
4 changes: 2 additions & 2 deletions docs/manuals/source/TasksAndConcepts/TransportEncryption.rst
Expand Up @@ -347,8 +347,8 @@ However, it is also possible to disable transport encryption and use cleartext t
...
}
|bareosFD| configuration
^^^^^^^^^^^^^^^^^^^^^^^^
|bareosFD| configuration before 18.2
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

.. code-block:: ini
:caption: :file:`/etc/bareos/bareos-fd.d/client/bareos-fd.conf`
Expand Down
Expand Up @@ -109,17 +109,17 @@ modifications of it based on two week cycles or longer.

.. _advantages-1:

Advantages
~~~~~~~~~~
Advantages of Daily Tape Rotation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

- All the data is stored on a single tape, so recoveries are simple and faster.

- Assuming the previous day’s tape is taken offsite each day, a maximum of one days data will be lost if the site burns down.

.. _disadvantages-1:

Disadvantages
~~~~~~~~~~~~~
Disadvantages of Daily Tape Rotation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

- The tape must be changed every day requiring a lot of operator intervention.

Expand All @@ -135,8 +135,8 @@ Disadvantages

.. _practical-details-1:

Practical Details
~~~~~~~~~~~~~~~~~
Practical Details of Daily Tape Rotation
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

The simplest way to "force" Bareos to use a different tape each day is to define a different Pool for each day of the the week a backup is done. In addition, you will need to specify appropriate Job and File retention periods so that Bareos will relabel and overwrite the tape each week rather than appending to it. Nic Bellamy has supplied an actual working model of this which we include here.

Expand Down

0 comments on commit eb92443

Please sign in to comment.