From 37db5bbe59d8278d9c3b54d44e6d4bf715daac65 Mon Sep 17 00:00:00 2001
From: acsfer <carlos@reendex.com>
Date: Thu, 2 Dec 2021 11:01:34 +0100
Subject: [PATCH] Don't recommend specific tuning

As values vary a lot between setups, just include mandatory settings for databases?
---
 .../linux_database_configuration.rst          | 75 +------------------
 1 file changed, 2 insertions(+), 73 deletions(-)

diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst
index 0d77289d986..eb1f1575c12 100644
--- a/admin_manual/configuration_database/linux_database_configuration.rst
+++ b/admin_manual/configuration_database/linux_database_configuration.rst
@@ -49,46 +49,11 @@ If you decide to use a MySQL or MariaDB database, ensure the following:
 
   [mysqld]
   ...
-  transaction_isolation = READ-COMMITTED
-  binlog_format = ROW
-  ...
-
-Your :file:`/etc/mysql/my.cnf` could look like this:
-
-::
-
-  [server]
-  skip_name_resolve = 1
-  innodb_buffer_pool_size = 128M
-  innodb_buffer_pool_instances = 1
-  innodb_flush_log_at_trx_commit = 2
-  innodb_log_buffer_size = 32M
-  innodb_max_dirty_pages_pct = 90
-  query_cache_type = 1
-  query_cache_limit = 2M
-  query_cache_min_res_unit = 2k
-  query_cache_size = 64M
-  tmp_table_size= 64M
-  max_heap_table_size= 64M
-  slow_query_log = 1
-  slow_query_log_file = /var/log/mysql/slow.log
-  long_query_time = 1
-
-  [client-server]
-  !includedir /etc/mysql/conf.d/
-  !includedir /etc/mysql/mariadb.conf.d/
-
-  [client]
-  default-character-set = utf8mb4
-
-  [mysqld]
   character_set_server = utf8mb4
   collation_server = utf8mb4_general_ci
   transaction_isolation = READ-COMMITTED
   binlog_format = ROW
-  innodb_large_prefix=on
-  innodb_file_format=barracuda
-  innodb_file_per_table=1
+  ...
 
 Please refer to the `page in the MySQL manual <https://mariadb.com/kb/en/library/set-transaction/#read-committed>`_.
 
@@ -98,27 +63,6 @@ Please refer to the `page in the MySQL manual <https://mariadb.com/kb/en/library
 
 .. note:: MariaDB is backwards compatible with MySQL.  All instructions work for both. You will not need to replace mysql with anything.
 
-The PHP configuration in :file:`/etc/php7/conf.d/mysql.ini` could look like this:
-
-::
-
-  # configuration for PHP MySQL module
-  extension=pdo_mysql.so
-
-  [mysql]
-  mysql.allow_local_infile=On
-  mysql.allow_persistent=On
-  mysql.cache_size=2000
-  mysql.max_persistent=-1
-  mysql.max_links=-1
-  mysql.default_port=
-  mysql.default_socket=/var/lib/mysql/mysql.sock  # Debian squeeze: /var/run/mysqld/mysqld.sock
-  mysql.default_host=
-  mysql.default_user=
-  mysql.default_password=
-  mysql.connect_timeout=60
-  mysql.trace_mode=Off
-
 Now you need to create a database user and the database itself by using the
 MySQL command line interface. The database tables will be created by Nextcloud
 when you login for the first time.
@@ -188,22 +132,7 @@ For further services and users, we recommend to create a separate
 database or PostgreSQL instance.
 
 If you decide to use a PostgreSQL database make sure that you have installed
-and enabled the PostgreSQL extension in PHP. The PHP configuration in :file:`/etc/php7/conf.d/pgsql.ini` could look
-like this:
-
-::
-
-  # configuration for PHP PostgreSQL module
-  extension=pdo_pgsql.so
-  extension=pgsql.so
-
-  [PostgresSQL]
-  pgsql.allow_persistent = On
-  pgsql.auto_reset_persistent = Off
-  pgsql.max_persistent = -1
-  pgsql.max_links = -1
-  pgsql.ignore_notice = 0
-  pgsql.log_notice = 0
+and enabled the PostgreSQL extension **pdo_pgsql** in PHP.
 
 The default configuration for PostgreSQL (at least in Ubuntu 14.04) is to use the peer authentication method. Check :file:`/etc/postgresql/9.3/main/pg_hba.conf` to find out which authentication method is used in your setup.
 To start the postgres command line mode use::