diff --git a/admin_manual/configuration_database/db_conversion.rst b/admin_manual/configuration_database/db_conversion.rst index ca491edf8..7ec13d60d 100644 --- a/admin_manual/configuration_database/db_conversion.rst +++ b/admin_manual/configuration_database/db_conversion.rst @@ -2,16 +2,16 @@ Converting database type ======================== -You can convert a SQLite database to a more performing MySQL, MariaDB or -PostgreSQL database with the Nextcloud command line tool. SQLite is good for -testing and simple single-user Nextcloud servers, but it does not scale for +You can convert a SQLite database to a better performing MySQL, MariaDB or +PostgreSQL database with the Nextcloud command line tool. SQLite is good for +testing and simple single-user Nextcloud servers, but it does not scale for multiple-user production users. Run the conversion ------------------ -First setup the new database, here called "new_db_name". +First set up the new database, here called "new_db_name". In Nextcloud root folder call :: @@ -25,8 +25,8 @@ The Options * ``--clear-schema`` clear schema (optional) * ``--all-apps`` by default, tables for enabled apps are converted, use to convert also tables of deactivated apps (optional) -*Note:* The converter searches for apps in your configured app folders and uses -the schema definitions in the apps to create the new table. So tables of removed +*Note:* The converter searches for apps in your configured app folders and uses +the schema definitions in the apps to create the new table. So tables of removed apps will not be converted even with option ``--all-apps`` For example @@ -35,17 +35,17 @@ For example php occ db:convert-type --all-apps mysql oc_mysql_user 127.0.0.1 new_db_name -To successfully proceed with the conversion, you must type ``yes`` when prompted +To successfully proceed with the conversion, you must type ``yes`` when prompted with the question ``Continue with the conversion?`` -On success the converter will automatically configure the new database in your +On success the converter will automatically configure the new database in your Nextcloud config ``config.php``. -Unconvertible tables +Inconvertible tables -------------------- -If you updated your Nextcloud installation there might exist old tables, which -are not used anymore. The converter will tell you which ones. +If you updated your Nextcloud instance, there might be remnants of old tables +which are not used any more. The updater will tell you which ones these are. :: diff --git a/admin_manual/configuration_database/linux_database_configuration.rst b/admin_manual/configuration_database/linux_database_configuration.rst index 9c15a72ac..93acc3e32 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -56,7 +56,7 @@ If you decide to use a MySQL or MariaDB database, ensure the following: Your :file:`/etc/mysql/my.cnf` could look like this: :: - + [server] skip-name-resolve innodb_buffer_pool_size = 128M @@ -73,7 +73,7 @@ Your :file:`/etc/mysql/my.cnf` could look like this: 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/ @@ -173,7 +173,7 @@ this: In case of UTF8MB4 you will also find:: "mysql.utf8mb4" => true, - + PostgreSQL database ^^^^^^^^^^^^^^^^^^^ @@ -212,7 +212,7 @@ You can quit the prompt by entering:: \q -An Nextcloud instance configured with PostgreSQL would contain the path to the socket on +A Nextcloud instance configured with PostgreSQL would contain the path to the socket on which the database is running as the hostname, the system username the PHP process is using, and an empty password to access it, and the name of the database. The :file:`config/config.php` as created by the :doc:`../installation/installation_wizard` would therefore contain entries like @@ -229,7 +229,7 @@ this: "dbhost" => "/var/run/postgresql", "dbtableprefix" => "oc_", -.. note:: The host actually points to the socket that is used to connect to the database. Using localhost here will not work if postgreSQL is configured to use peer authentication. Also note, that no password is specified, because this authentication method doesn't use a password. +.. note:: The host actually points to the socket that is used to connect to the database. Using localhost here will not work if postgreSQL is configured to use peer authentication. Also note that no password is specified, because this authentication method doesn't use a password. If you use another authentication method (not peer), you'll need to use the following steps to get the database setup: Now you need to create a database user and the database itself by using the @@ -253,7 +253,7 @@ You can quit the prompt by entering:: \q -An Nextcloud instance configured with PostgreSQL would contain the hostname on +A Nextcloud instance configured with PostgreSQL would contain the hostname on which the database is running, a valid username and password to access it, and the name of the database. The :file:`config/config.php` as created by the :doc:`../installation/installation_wizard` would therefore contain entries like @@ -275,10 +275,10 @@ this: Troubleshooting --------------- -How to workaround general error: 2006 MySQL server has gone away +How to work around "general error: 2006 MySQL server has gone away" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The database request takes too long and therefore the MySQL server times out. Its +The database request takes too long and therefore the MySQL server times out. It's also possible that the server is dropping a packet that is too large. Please refer to the manual of your database for how to raise the configuration options ``wait_timeout`` and/or ``max_allowed_packet``. @@ -309,7 +309,7 @@ itself works correctly, see the next question. How can I find out if a created user can access a database? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The easiest way to test if a database can be accessed is by starting the +The easiest way to test if a database is accessible is by starting the command line interface: **MySQL**: diff --git a/admin_manual/configuration_database/mysql_4byte_support.rst b/admin_manual/configuration_database/mysql_4byte_support.rst index 3e277f14a..ddeca2bdb 100644 --- a/admin_manual/configuration_database/mysql_4byte_support.rst +++ b/admin_manual/configuration_database/mysql_4byte_support.rst @@ -35,7 +35,7 @@ MariaDB support 1. Follow MySQL steps 1, 2 and 3 -2. Figure out whether the file formate was changed to Barracuda:: +2. Figure out whether the file format was changed to Barracuda:: MariaDB> SELECT NAME, SPACE, FILE_FORMAT FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME like "nextcloud%"; @@ -54,5 +54,4 @@ This will return an SQL command for each table in the nextcloud database. The ro Replace oc_tablename with the failing table. If there are too many (did not happen here), SQL commands can be generated in a batch (task for the reader). -Now everything should be fine and the MySQL instructions should be proceeded. - +Now everything should be fine and the MySQL instructions can be followed.