From e7b8ad165ecd6adfc7a9f5170098d2e1ce9d6fa8 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Tue, 10 Nov 2026 14:30:54 +0100 Subject: [PATCH 1/2] docs(admin): update pdo_mysql config section * The legacy `mysql` module has been removed with PHP 7.0. * `pdo_mysql` is used, which `extension=pdo_mysql.so` even reflected, but the used config keys were for the `mysql` module, hence ineffective. * `pdo_mysql` has only two keys, from which only `pdo_mysql.default_socket` is relevant: https://www.php.net/manual/en/ref.pdo-mysql.php#pdo-mysql.configuration * The builtin `pdo_mysql.default_socket` is usually correct, and should only be adjusted if it does not work OOTB. That way, changed distro defaults won't beak the setup. E.g. Debian Forky will switch from `/run/mysqld/mysqld.sock` to `/run/mariadbd/mysqld.sock`, hence setting this explicilty will cause a distro upgrade to break things. * ini sections in PHP config files generally serve visual structuring only, but are otherwise ignored. The more common `;` for comments in PHP configs is used, otherwise the example is kept minimal, focusing on the added `pdo_mysql.default_socket`. The config file path has been made more generic. Debian has its own config structure, with `phpenmod`/`phpdismod`, which not all distros share. But a per-module config file somewhere below /etc/php is common. * The backwards-compatibility note has been moved below the config example, so that the `pdo_mysql.default_socket` sentence and related config example stay together. Signed-off-by: MichaIng --- .../linux_database_configuration.rst | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst index 90ae631c235..8d1a1dd4689 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -100,30 +100,17 @@ Please refer to the `page in the MySQL manual Date: Tue, 10 Nov 2026 15:29:37 +0100 Subject: [PATCH 2/2] docs(admin): make use of code blocks The database configuration page did not make use of explicit code clocks with respective syntax highlighting. This is hereby done across the page, replacing generic `::` blocks. Signed-off-by: MichaIng --- .../linux_database_configuration.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst index 8d1a1dd4689..59d197179d9 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -51,7 +51,7 @@ If you decide to use a MySQL or MariaDB database, ensure the following: Verify the **transaction_isolation** and **binlog_format**: -:: +.. code-block:: ini [mysqld] ... @@ -61,7 +61,7 @@ If you decide to use a MySQL or MariaDB database, ensure the following: Your :file:`/etc/mysql/my.cnf` could look like this: -:: +.. code-block:: ini [server] skip_name_resolve = 1 @@ -103,7 +103,7 @@ Please refer to the `page in the MySQL manual ** or **MariaDB [root]>** prompt will appear. Now enter the following lines and confirm them with the enter key: -:: +.. code-block:: sql CREATE USER 'username'@'localhost' IDENTIFIED BY 'password'; CREATE DATABASE IF NOT EXISTS nextcloud CHARACTER SET utf8mb4 COLLATE utf8mb4_bin; @@ -142,7 +142,7 @@ name of the database. The :file:`config/config.php` as created by the :doc:`../installation/installation_wizard` would therefore contain entries like this: -:: +.. code-block:: php [ \PDO::MYSQL_ATTR_SSL_KEY => '/../ssl-key.pem', @@ -193,12 +193,12 @@ 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 +and enabled the PostgreSQL extension in PHP. The PHP configuration in :file:`/etc/php/**/pgsql.ini` could look like this: -:: +.. code-block:: ini - # configuration for PHP PostgreSQL module + ; configuration for PHP PostgreSQL module extension=pdo_pgsql.so extension=pgsql.so @@ -217,7 +217,7 @@ To start the postgres command line mode use:: Then a **template1=#** prompt will appear. Now enter the following lines and confirm them with the enter key: -:: +.. code-block:: sql CREATE USER username CREATEDB; CREATE DATABASE nextcloud OWNER username TEMPLATE template0 ENCODING 'UTF8'; @@ -233,7 +233,7 @@ and an empty password to access it, and the name of the database. The :file:`con created by the :doc:`../installation/installation_wizard` would therefore contain entries like this: -:: +.. code-block:: php [ 'mode' => 'verify-full',