Merge pull request #14880 from nextcloud/backport/14850/stable32

[stable32] fix(docs): add dedicated MariaDB backup/restore sections

Author: skjnldsv

admin_manual/maintenance/backup.rst

@@ -40,20 +40,28 @@ Backup database
 
 .. warning:: Before restoring a backup see :doc:`restore`
 
-MySQL/MariaDB
-^^^^^^^^^^^^^
+MariaDB
+^^^^^^^
 
-MySQL or MariaDB, which is a drop-in MySQL replacement, is the recommended
-database engine. To backup **MySQL**::
+MariaDB is the recommended database engine. To backup MariaDB using `mariadb-dump <https://mariadb.com/docs/server/clients-and-utilities/backup-restore-and-import-clients/mariadb-dump>`_::
+
+    mariadb-dump --single-transaction -h [server] -u [username] -p[password] [db_name] > nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
+
+If you have enabled MariaDB 4-byte support (:doc:`../configuration_database/mysql_4byte_support`, needed for emoji), add ``--default-character-set=utf8mb4``::
+
+    mariadb-dump --single-transaction --default-character-set=utf8mb4 -h [server] -u [username] -p[password] [db_name] > nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
+
+MySQL
+^^^^^
+
+To backup MySQL::
 
     mysqldump --single-transaction -h [server] -u [username] -p[password] [db_name] > nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
 
-If you use enabled MySQL/MariaDB 4-byte support (:doc:`../configuration_database/mysql_4byte_support`, needed for emoji), you will need to add ``--default-character-set=utf8mb4`` like this::
+If you have enabled MySQL 4-byte support (:doc:`../configuration_database/mysql_4byte_support`, needed for emoji), add ``--default-character-set=utf8mb4``::
 
     mysqldump --single-transaction --default-character-set=utf8mb4 -h [server] -u [username] -p[password] [db_name] > nextcloud-sqlbkp_`date +"%Y%m%d"`.bak
 
-To backup **MariaDB**, replace `mysqldump` with `mariadb-dump` in the above commands.
-
 SQLite
 ^^^^^^
 ::

admin_manual/maintenance/restore.rst

@@ -32,10 +32,23 @@ Restore database
 The easiest way to do this is to drop and recreate the database.
 SQLite does this automatically.
 
+MariaDB
+^^^^^^^
+
+MariaDB is the recommended database engine. To restore MariaDB using the `mariadb <https://mariadb.com/docs/server/clients-and-utilities/mariadb-client/mariadb-command-line-client>`_ client::
+
+   mariadb -h [server] -u [username] -p[password] -e "DROP DATABASE nextcloud"
+   mariadb -h [server] -u [username] -p[password] -e "CREATE DATABASE nextcloud"
+
+If you use UTF8 with multibyte support (e.g. for emojis in filenames), use::
+
+   mariadb -h [server] -u [username] -p[password] -e "DROP DATABASE nextcloud"
+   mariadb -h [server] -u [username] -p[password] -e "CREATE DATABASE nextcloud CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"
+
 MySQL
 ^^^^^
 
-MySQL is the recommended database engine. To restore MySQL::
+To restore MySQL::
 
    mysql -h [server] -u [username] -p[password] -e "DROP DATABASE nextcloud"
    mysql -h [server] -u [username] -p[password] -e "CREATE DATABASE nextcloud"
@@ -59,10 +72,17 @@ Restoring
 .. note:: This guide assumes that your previous backup is called
    "nextcloud-sqlbkp.bak"
 
+MariaDB
+^^^^^^^
+
+MariaDB is the recommended database engine. To restore MariaDB using the `mariadb <https://mariadb.com/docs/server/clients-and-utilities/mariadb-client/mariadb-command-line-client>`_ client::
+
+    mariadb -h [server] -u [username] -p[password] [db_name] < nextcloud-sqlbkp.bak
+
 MySQL
 ^^^^^
 
-MySQL is the recommended database engine. To restore MySQL::
+To restore MySQL::
 
     mysql -h [server] -u [username] -p[password] [db_name] < nextcloud-sqlbkp.bak