From 44b3b09227365b883494528c3804e81e99137234 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 1 Feb 2019 16:34:32 +0100 Subject: [PATCH 1/5] Move server tuning from configuration section to the installation section Signed-off-by: Morris Jobke --- admin_manual/configuration_server/index.rst | 1 - admin_manual/installation/index.rst | 1 + .../{configuration_server => installation}/server_tuning.rst | 4 ++-- go.php | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename admin_manual/{configuration_server => installation}/server_tuning.rst (97%) diff --git a/admin_manual/configuration_server/index.rst b/admin_manual/configuration_server/index.rst index bb7496826..c0d74874c 100644 --- a/admin_manual/configuration_server/index.rst +++ b/admin_manual/configuration_server/index.rst @@ -19,7 +19,6 @@ Server configuration antivirus_configuration reverse_proxy_configuration automatic_configuration - server_tuning theming oauth2 diff --git a/admin_manual/installation/index.rst b/admin_manual/installation/index.rst index e6113e042..d2bc4784a 100644 --- a/admin_manual/installation/index.rst +++ b/admin_manual/installation/index.rst @@ -14,3 +14,4 @@ Installation php_72_installation selinux_configuration nginx + server_tuning diff --git a/admin_manual/configuration_server/server_tuning.rst b/admin_manual/installation/server_tuning.rst similarity index 97% rename from admin_manual/configuration_server/server_tuning.rst rename to admin_manual/installation/server_tuning.rst index 192d83470..6b02f183b 100644 --- a/admin_manual/configuration_server/server_tuning.rst +++ b/admin_manual/installation/server_tuning.rst @@ -5,7 +5,7 @@ Server tuning Using cron to perform background jobs ------------------------------------- -See :doc:`background_jobs_configuration` for a description and the +See :doc:`../configuration_server/background_jobs_configuration` for a description and the benefits. Reducing system load @@ -28,7 +28,7 @@ Caching Caching improves performance by storing data, code, and other objects in memory. Memory cache configuration for the Nextcloud server must be installed and configured. -See :doc:`caching_configuration`. +See :doc:`../configuration_server/caching_configuration`. Using MariaDB/MySQL instead of SQLite ------------------------------------- diff --git a/go.php b/go.php index c80c2c1d4..14e2f47b8 100644 --- a/go.php +++ b/go.php @@ -22,9 +22,9 @@ $mapping = array( 'admin-ldap' => '/admin_manual/configuration_user/user_auth_ldap.html', 'admin-mysql-utf8mb4' => '/admin_manual/configuration_database/mysql_4byte_support.html', 'admin-nginx' => '/admin_manual/installation/nginx.html', - 'admin-performance' => '/admin_manual/configuration_server/server_tuning.html', + 'admin-performance' => '/admin_manual/installation/server_tuning.html', 'admin-php-fpm' => '/admin_manual/installation/source_installation.html#php-fpm-tips-label', - 'admin-php-opcache' => '/admin_manual/configuration_server/server_tuning.html#enable-php-opcache', + 'admin-php-opcache' => '/admin_manual/installation/server_tuning.html#enable-php-opcache', 'admin-provisioning-api' => '/admin_manual/configuration_user/user_provisioning_api.html', 'admin-reverse-proxy' => '/admin_manual/configuration_server/reverse_proxy_configuration.html', 'admin-security' => '/admin_manual/configuration_server/harden_server.html', From e77e852a9e485e219a2a785490bf5ee81f08567a Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 1 Feb 2019 16:34:57 +0100 Subject: [PATCH 2/5] Fix broken links - regression from #980 Signed-off-by: Morris Jobke --- admin_manual/configuration_server/occ_command.rst | 2 +- admin_manual/file_workflows/access_control.rst | 3 +-- admin_manual/file_workflows/automated_tagging.rst | 3 +-- admin_manual/file_workflows/retention.rst | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/admin_manual/configuration_server/occ_command.rst b/admin_manual/configuration_server/occ_command.rst index 75c0dcf34..f555f1d62 100644 --- a/admin_manual/configuration_server/occ_command.rst +++ b/admin_manual/configuration_server/occ_command.rst @@ -264,7 +264,7 @@ The other two commands are: * ``background:cron`` * ``background:webcron`` -See :doc:`../configuration_server/background_jobs_configuration` to learn more. +See :doc:`background_jobs_configuration` to learn more. .. _config_commands_label: diff --git a/admin_manual/file_workflows/access_control.rst b/admin_manual/file_workflows/access_control.rst index 2517f1ff1..82f84516e 100644 --- a/admin_manual/file_workflows/access_control.rst +++ b/admin_manual/file_workflows/access_control.rst @@ -21,8 +21,7 @@ If access to a file has been denied for a user, the user can not: Examples -------- -After installing the File Access Control app as described in -:doc:`../installation/apps_management_installation` +After installing the File Access Control app as described in :doc:`../apps_management` navigate to the configuration and locate the File Access Control settings. .. figure:: images/files_access_control_sample_rules.png diff --git a/admin_manual/file_workflows/automated_tagging.rst b/admin_manual/file_workflows/automated_tagging.rst index 2d5e56d68..62a26f1c4 100644 --- a/admin_manual/file_workflows/automated_tagging.rst +++ b/admin_manual/file_workflows/automated_tagging.rst @@ -18,8 +18,7 @@ allow access against the owners will. Example ------- -After installing the Files automated tagging app as described in -:doc:`../installation/apps_management_installation` +After installing the Files automated tagging app as described in :doc:`../apps_management` navigate to the configuration and locate the Workflow settings. .. figure:: images/automated_tagging_sample_rule.png diff --git a/admin_manual/file_workflows/retention.rst b/admin_manual/file_workflows/retention.rst index 8a942285d..f317cd7dd 100644 --- a/admin_manual/file_workflows/retention.rst +++ b/admin_manual/file_workflows/retention.rst @@ -8,8 +8,7 @@ are tagged with a collaborative tag and have a certain age. Example ------- -After installing the Retention app as described in -:doc:`../installation/apps_management_installation` +After installing the Retention app as described in :doc:`../apps_management` navigate to the configuration and locate the Workflow settings. .. figure:: images/retention_sample.png From 64d62c64897217e3b701c9964048508f4852f9d4 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 1 Feb 2019 16:37:14 +0100 Subject: [PATCH 3/5] Move "hardening server" section from configuration to installation part Signed-off-by: Morris Jobke --- admin_manual/configuration_server/index.rst | 1 - .../{configuration_server => installation}/harden_server.rst | 0 admin_manual/installation/index.rst | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) rename admin_manual/{configuration_server => installation}/harden_server.rst (100%) diff --git a/admin_manual/configuration_server/index.rst b/admin_manual/configuration_server/index.rst index c0d74874c..2bb892b02 100644 --- a/admin_manual/configuration_server/index.rst +++ b/admin_manual/configuration_server/index.rst @@ -15,7 +15,6 @@ Server configuration external_sites language_configuration logging_configuration - harden_server antivirus_configuration reverse_proxy_configuration automatic_configuration diff --git a/admin_manual/configuration_server/harden_server.rst b/admin_manual/installation/harden_server.rst similarity index 100% rename from admin_manual/configuration_server/harden_server.rst rename to admin_manual/installation/harden_server.rst diff --git a/admin_manual/installation/index.rst b/admin_manual/installation/index.rst index d2bc4784a..1421a1452 100644 --- a/admin_manual/installation/index.rst +++ b/admin_manual/installation/index.rst @@ -14,4 +14,5 @@ Installation php_72_installation selinux_configuration nginx + harden_server server_tuning From d5780957adecb9914fa0a7bf417acea302a3e277 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 1 Feb 2019 16:48:33 +0100 Subject: [PATCH 4/5] Rename sections and remove "configuration/configure" from the elements in the configuration section Signed-off-by: Morris Jobke --- .../configuration_server/activity_configuration.rst | 6 +++--- .../configuration_server/antivirus_configuration.rst | 6 +++--- .../configuration_server/automatic_configuration.rst | 6 +++--- .../configuration_server/background_jobs_configuration.rst | 6 +++--- admin_manual/configuration_server/caching_configuration.rst | 6 +++--- admin_manual/configuration_server/email_configuration.rst | 6 +++--- admin_manual/configuration_server/index.rst | 6 +++--- .../configuration_server/language_configuration.rst | 6 +++--- admin_manual/configuration_server/logging_configuration.rst | 6 +++--- .../configuration_server/reverse_proxy_configuration.rst | 6 +++--- admin_manual/installation/index.rst | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/admin_manual/configuration_server/activity_configuration.rst b/admin_manual/configuration_server/activity_configuration.rst index 3f9c5183d..341b07e81 100644 --- a/admin_manual/configuration_server/activity_configuration.rst +++ b/admin_manual/configuration_server/activity_configuration.rst @@ -1,6 +1,6 @@ -============================ -Configuring the activity app -============================ +============ +Activity app +============ You can configure your Nextcloud server to automatically send out e-mail notifications to your users for various events like: diff --git a/admin_manual/configuration_server/antivirus_configuration.rst b/admin_manual/configuration_server/antivirus_configuration.rst index 880820f4c..8ac068d5d 100644 --- a/admin_manual/configuration_server/antivirus_configuration.rst +++ b/admin_manual/configuration_server/antivirus_configuration.rst @@ -1,6 +1,6 @@ -=============================== -Antivirus scanner configuration -=============================== +================= +Antivirus scanner +================= You can configure your Nextcloud server to automatically run a virus scan on newly-uploaded files with the Antivirus app for Files. The Antivirus app for diff --git a/admin_manual/configuration_server/automatic_configuration.rst b/admin_manual/configuration_server/automatic_configuration.rst index 09b31cddc..42dd58e8d 100644 --- a/admin_manual/configuration_server/automatic_configuration.rst +++ b/admin_manual/configuration_server/automatic_configuration.rst @@ -1,6 +1,6 @@ -============================= -Automatic configuration setup -============================= +=============== +Automatic setup +=============== If you need to install Nextcloud on multiple servers, you normally do not want to set up each instance separately as described in diff --git a/admin_manual/configuration_server/background_jobs_configuration.rst b/admin_manual/configuration_server/background_jobs_configuration.rst index f396e7679..0466d34af 100644 --- a/admin_manual/configuration_server/background_jobs_configuration.rst +++ b/admin_manual/configuration_server/background_jobs_configuration.rst @@ -1,6 +1,6 @@ -======================== -Defining background jobs -======================== +=============== +Background jobs +=============== A system like Nextcloud sometimes requires tasks to be done on a regular basis without the need for user interaction or hindering Nextcloud performance. For that purpose, as a system administrator, you can define background jobs (for diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst index 0c26868f7..98b7d3c58 100644 --- a/admin_manual/configuration_server/caching_configuration.rst +++ b/admin_manual/configuration_server/caching_configuration.rst @@ -1,6 +1,6 @@ -========================== -Configuring memory caching -========================== +============== +Memory caching +============== You can significantly improve your Nextcloud server performance with memory caching, where frequently-requested objects are stored in memory for faster diff --git a/admin_manual/configuration_server/email_configuration.rst b/admin_manual/configuration_server/email_configuration.rst index 274c236a9..f5a62937c 100644 --- a/admin_manual/configuration_server/email_configuration.rst +++ b/admin_manual/configuration_server/email_configuration.rst @@ -1,6 +1,6 @@ -=================== -Email configuration -=================== +===== +Email +===== Nextcloud is capable of sending password reset emails, notifying users of new file shares, changes in files, and activity notifications. Your users configure diff --git a/admin_manual/configuration_server/index.rst b/admin_manual/configuration_server/index.rst index 2bb892b02..2d3716e41 100644 --- a/admin_manual/configuration_server/index.rst +++ b/admin_manual/configuration_server/index.rst @@ -1,6 +1,6 @@ -==================== -Server configuration -==================== +======================= +Nextcloud configuration +======================= .. toctree:: :maxdepth: 2 diff --git a/admin_manual/configuration_server/language_configuration.rst b/admin_manual/configuration_server/language_configuration.rst index b19130463..51547939a 100644 --- a/admin_manual/configuration_server/language_configuration.rst +++ b/admin_manual/configuration_server/language_configuration.rst @@ -1,6 +1,6 @@ -====================== -Language configuration -====================== +================= +Language & Locale +================= Default language ---------------- diff --git a/admin_manual/configuration_server/logging_configuration.rst b/admin_manual/configuration_server/logging_configuration.rst index cbca04f87..1dd2109f5 100644 --- a/admin_manual/configuration_server/logging_configuration.rst +++ b/admin_manual/configuration_server/logging_configuration.rst @@ -1,6 +1,6 @@ -===================== -Logging configuration -===================== +======= +Logging +======= Use your Nextcloud log to review system status, or to help debug problems. You may adjust logging levels, and choose between using the Nextcloud log or your syslog. diff --git a/admin_manual/configuration_server/reverse_proxy_configuration.rst b/admin_manual/configuration_server/reverse_proxy_configuration.rst index 3ab9a7e63..8bdf9b801 100644 --- a/admin_manual/configuration_server/reverse_proxy_configuration.rst +++ b/admin_manual/configuration_server/reverse_proxy_configuration.rst @@ -1,6 +1,6 @@ -=========================== -Reverse proxy configuration -=========================== +============= +Reverse proxy +============= Nextcloud can be run through a reverse proxy, which can cache static assets such as images, CSS or JS files, move the load of handling HTTPS to a different diff --git a/admin_manual/installation/index.rst b/admin_manual/installation/index.rst index 1421a1452..6bb025329 100644 --- a/admin_manual/installation/index.rst +++ b/admin_manual/installation/index.rst @@ -1,6 +1,6 @@ -============ -Installation -============ +===================================== +Installation and server configuration +===================================== .. toctree:: :maxdepth: 2 From 131d81438e2f0c13e327100b4bf43026730ec517 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 1 Feb 2019 16:48:55 +0100 Subject: [PATCH 5/5] Move the note about autoconfig up Signed-off-by: Morris Jobke --- .../configuration_server/automatic_configuration.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin_manual/configuration_server/automatic_configuration.rst b/admin_manual/configuration_server/automatic_configuration.rst index 42dd58e8d..6916fda06 100644 --- a/admin_manual/configuration_server/automatic_configuration.rst +++ b/admin_manual/configuration_server/automatic_configuration.rst @@ -13,6 +13,10 @@ You can specify any number of parameters in this file. Any unspecified paramete The :file:`config/autoconfig.php` is automatically removed after the initial configuration has been applied. +.. note:: Keep in mind that the automatic configuration does not eliminate the need for + creating the database user and database in advance, as described in + :doc:`../configuration_database/linux_database_configuration`. + Parameters ---------- When configuring parameters, you must understand that two parameters are named differently in this configuration file when compared to the standard :file:`config.php` file. @@ -74,10 +78,6 @@ Using the following parameter settings, the "Finish setup" screen requests data "dbtableprefix" => "", ); -.. note:: Keep in mind that the automatic configuration does not eliminate the need for - creating the database user and database in advance, as described in - :doc:`../configuration_database/linux_database_configuration`. - PostgreSQL database ^^^^^^^^^^^^^^^^^^^