From 27cb92fb6b598b50bdd06e3c76feb9613f849ff0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 5 Jan 2017 10:00:43 +0100 Subject: [PATCH 1/4] Adjust more mentions on php versions Signed-off-by: Joas Schilling --- .../big_file_upload_configuration.rst | 2 +- .../caching_configuration.rst | 44 +++---------------- .../configuration_server/occ_command.rst | 4 +- .../security_setup_warnings.rst | 5 +-- .../configuration_user/user_auth_ldap.rst | 5 +-- .../installation/source_installation.rst | 9 ++-- .../operations/scaling_multiple_machines.rst | 2 +- developer_manual/app/info.rst | 2 +- 8 files changed, 20 insertions(+), 53 deletions(-) diff --git a/admin_manual/configuration_files/big_file_upload_configuration.rst b/admin_manual/configuration_files/big_file_upload_configuration.rst index a504a0f95..bd0ef564d 100644 --- a/admin_manual/configuration_files/big_file_upload_configuration.rst +++ b/admin_manual/configuration_files/big_file_upload_configuration.rst @@ -21,7 +21,7 @@ filesystem. System Configuration -------------------- -* Make sure that the latest version of PHP (at least 5.4.9) is installed +* Make sure that the latest version of PHP (at least 5.6.6) is installed * Disable user quotas, which makes them unlimited * Your temp file or partition has to be big enough to hold multiple parallel uploads from multiple users; e.g. if the max upload size is 10GB and diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst index f232f0284..971dbea55 100644 --- a/admin_manual/configuration_server/caching_configuration.rst +++ b/admin_manual/configuration_server/caching_configuration.rst @@ -16,24 +16,15 @@ if you prefer.** A PHP opcache stores compiled PHP scripts so they don't need to be re-compiled every time they are called. PHP bundles the Zend OPcache in core since version -5.5, so you don't need to install an opcache for PHP 5.5+. +5.5, so you don't need to install an opcache manually. -If you are using PHP 5.4, which is the oldest supported PHP version for -Nextcloud, you may install the Alternative PHP Cache (APC). This is both an -opcache and data cache. APC has not been updated since 2012 and is essentially -dead, and PHP 5.4 is old and lags behind later releases. If it is possible -to upgrade to a later PHP release that is the best option. - -Data caching is supplied by the Alternative PHP Cache, user (APCu) in PHP -5.5+, Memcached, or Redis. +Data caching is supplied by the Alternative PHP Cache, user (APCu), Memcached, or Redis. Nextcloud supports multiple memory caching backends, so you can choose the type of memcache that best fits your needs. The supported caching backends are: -* `APC `_ - A local cache for systems running PHP 5.4. * `APCu `_, APCu 4.0.6 and up required. - A local cache for systems running PHP 5.5 and up. + A local cache for systems. * `Memcached `_ Distributed cache for multi-server Nextcloud installations. * `Redis `_, PHP module 2.2.5 and up required. @@ -47,24 +38,6 @@ all possible config parameters). You may use both a local and a distributed cache. Recommended caches are APCu and Redis. After installing and enabling your chosen memcache, verify that it is active by running :ref:`label-phpinfo`. - -APC ---- - -APC is only for systems running PHP 5.4 and older. The oldest supported PHP -version in Nextcloud is 5.4. - -.. note:: RHEL 6 and CentOS 6 ship with PHP 5.3 and must be upgraded to PHP - 5.4 to run Nextcloud. See :doc:`../installation/php_54_installation`. - -On Red Hat/CentOS/Fedora systems running PHP 5.4, install ``php-pecl-apc``. On -Debian/Ubuntu/Mint systems install ``php-apc``. Then restart your Web server. - -After restarting your Web server, add this line to your ``config.php`` file:: - - 'memcache.local' => '\OC\Memcache\APC', - -Refresh your Nextcloud admin page, and the cache warning should disappear. APCu ---- @@ -72,7 +45,7 @@ APCu PHP 5.5 and up include the Zend OPcache in core, and on most Linux distributions it is enabled by default. However, it does not bundle a data cache. APCu is a data cache, and it is available in most -Linux distributions. On Red Hat/CentOS/Fedora systems running PHP 5.5 and up +Linux distributions. On Red Hat/CentOS/Fedora systems running PHP 5.6 install ``php-pecl-apcu``. On Debian/Ubuntu/Mint systems install ``php5-apcu``. On Ubuntu 14.04LTS, the APCu version is 4.0.2, which is too old to use with Nextcloud. Nextcloud requires 4.0.6+. You may install 4.0.7 from Ubuntu backports with this command:: @@ -246,12 +219,9 @@ supported version, or that does not package Redis at all, such as SUSE Linux Enterprise Server and Red Hat Enterprise Linux. The Redis PHP module must be at least version 2.2.5. Please note that -the Redis PHP module versions 2.2.5 - 2.2.7 will only work for: - -:: - - PHP version 6.0.0 or older - PHP version 5.2.0 or newer +the Redis PHP module versions 2.2.x will only work for PHP 5.6.x. + +For PHP 7.0 and PHP 7.1 use Redis PHP module 3.1.x or later. See ``_ diff --git a/admin_manual/configuration_server/occ_command.rst b/admin_manual/configuration_server/occ_command.rst index 7c7a74b84..3c3b924e4 100644 --- a/admin_manual/configuration_server/occ_command.rst +++ b/admin_manual/configuration_server/occ_command.rst @@ -55,9 +55,9 @@ The HTTP user is different on the various Linux distributions. See If your HTTP server is configured to use a different PHP version than the default (/usr/bin/php), ``occ`` should be run with the same version. For -example, in CentOS 6.5 with SCL-PHP54 installed, the command looks like this:: +example, in CentOS 6.5 with SCL-PHP56 installed, the command looks like this:: - sudo -u apache /opt/rh/php54/root/usr/bin/php /var/www/html/nextcloud/occ + sudo -u apache /opt/rh/php56/root/usr/bin/php /var/www/html/nextcloud/occ Running ``occ`` with no options lists all commands and options, like this example on Ubuntu:: diff --git a/admin_manual/configuration_server/security_setup_warnings.rst b/admin_manual/configuration_server/security_setup_warnings.rst index cc2810cf7..9f39429fd 100644 --- a/admin_manual/configuration_server/security_setup_warnings.rst +++ b/admin_manual/configuration_server/security_setup_warnings.rst @@ -15,10 +15,9 @@ Cache Warnings configure a memcache if available." Nextcloud supports multiple php caching extensions: -* APC (PHP 5.4 only) -* APCu (PHP 5.5+, minimum required PHP extension version 4.0.6) +* APCu (minimum required PHP extension version 4.0.6) * Memcached -* Redis (minimum required php extension version: 2.2.5) +* Redis (minimum required PHP extension version: 2.2.5) You will see this warning if you have no caches installed and enabled, or if your cache does not have the required minimum version installed; older versions diff --git a/admin_manual/configuration_user/user_auth_ldap.rst b/admin_manual/configuration_user/user_auth_ldap.rst index 86c4230e8..b45f26bcf 100644 --- a/admin_manual/configuration_user/user_auth_ldap.rst +++ b/admin_manual/configuration_user/user_auth_ldap.rst @@ -10,7 +10,7 @@ group memberships, quotas, and sharing permissions just like any other Nextcloud user. .. note:: The PHP LDAP module is required; this is supplied by ``php5-ldap`` on - Debian/Ubuntu, and ``php-ldap`` on CentOS/Red Hat/Fedora. PHP 5.4+ is + Debian/Ubuntu, and ``php-ldap`` on CentOS/Red Hat/Fedora. PHP 5.6+ is required in Nextcloud. The LDAP application supports: @@ -650,8 +650,7 @@ job which keeps the ``user-group-mappings`` up-to-date, and always in cache. Under normal circumstances, all users are never loaded at the same time. Typically the loading of users happens while page results are generated, in steps of 30 until the limit is reached or no results are left. For this to -work on an oC-Server and LDAP-Server, **Paged Results** must be supported, -which presumes PHP >= 5.4. +work on an oC-Server and LDAP-Server, **Paged Results** must be supported. Nextcloud remembers which user belongs to which LDAP-configuration. That means each request will always be directed to the right server unless a user is diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index 1cc6ab5b0..9205e0975 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -40,7 +40,7 @@ If you get a result, the module is present. Required: -* php5 (>= 5.6) +* php (>= 5.6, 7.0 or 7.1) * PHP module ctype * PHP module dom * PHP module GD @@ -87,8 +87,7 @@ Recommended for specific apps (*optional*): For enhanced server performance (*optional*) select one of the following memcaches: -* PHP module apc -* PHP module apcu +* PHP module apcu (>= 4.0.6) * PHP module memcached * PHP module redis (>= 2.2.5, required for Transactional File Locking) @@ -365,11 +364,11 @@ ini file. This can be the case, for example, for the ``date.timezone`` setting. php-fpm Configuration Notes --------------------------- -**Security: Use at least PHP => 5.5.22 or >= 5.6.6** +**Security: Use at least PHP >= 5.6.6** Due to `a bug with security implications `_ in older PHP releases with the handling of XML data you are highly encouraged to run -at least PHP 5.5.22 or 5.6.6 when in a threaded environment. +at least PHP 5.6.6 when in a threaded environment. **System environment variables** diff --git a/admin_manual/operations/scaling_multiple_machines.rst b/admin_manual/operations/scaling_multiple_machines.rst index b4f9c6969..e0979a5fa 100644 --- a/admin_manual/operations/scaling_multiple_machines.rst +++ b/admin_manual/operations/scaling_multiple_machines.rst @@ -28,7 +28,7 @@ structure placing the Nextcloud code in the Apache root directory. The following components were installed on each application server: * Apache -* PHP 5.4.x +* PHP 5.6.x * PHP-GD * PHP-XML * PHP-MYSQL diff --git a/developer_manual/app/info.rst b/developer_manual/app/info.rst index bb7bf0619..f2d8489dc 100644 --- a/developer_manual/app/info.rst +++ b/developer_manual/app/info.rst @@ -40,7 +40,7 @@ The :file:`appinfo/info.xml` contains metadata about the app: 1234 - + sqlite mysql grep From af8987fdfc375d2d80e8a6c6cb609858b364fbd1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 5 Jan 2017 10:10:18 +0100 Subject: [PATCH 2/4] Take in changed from tflidd https://github.com/nextcloud/documentation/pull/300 Signed-off-by: Joas Schilling --- .../configuration_server/caching_configuration.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst index 971dbea55..2f9026d70 100644 --- a/admin_manual/configuration_server/caching_configuration.rst +++ b/admin_manual/configuration_server/caching_configuration.rst @@ -18,7 +18,7 @@ A PHP opcache stores compiled PHP scripts so they don't need to be re-compiled every time they are called. PHP bundles the Zend OPcache in core since version 5.5, so you don't need to install an opcache manually. -Data caching is supplied by the Alternative PHP Cache, user (APCu), Memcached, or Redis. +Data caching is supplied by the user (APCu), Memcached or Redis. Nextcloud supports multiple memory caching backends, so you can choose the type of memcache that best fits your needs. The supported caching backends are: @@ -45,9 +45,10 @@ APCu PHP 5.5 and up include the Zend OPcache in core, and on most Linux distributions it is enabled by default. However, it does not bundle a data cache. APCu is a data cache, and it is available in most -Linux distributions. On Red Hat/CentOS/Fedora systems running PHP 5.6 -install ``php-pecl-apcu``. On Debian/Ubuntu/Mint systems install ``php5-apcu``. -On Ubuntu 14.04LTS, the APCu version is 4.0.2, which is too old to use with Nextcloud. Nextcloud requires 4.0.6+. You may install 4.0.7 from Ubuntu backports with this command:: +Linux distributions. On Red Hat/CentOS/Fedora systems install +``php-pecl-apcu``. On Debian/Ubuntu/Mint systems install ``php5-apcu`` or ``php7.0-apcu``. +On Ubuntu 14.04LTS, the APCu version (4.0.2) is too old to use with Nextcloud (requires 4.0.6+). +You may install 4.0.7 from Ubuntu backports with this command:: apt-get install php5-apcu/trusty-backports @@ -112,7 +113,7 @@ The Redis PHP module must be version 2.2.5+. If you are running a Linux distribution that does not package the supported versions of this module, or does not package Redis at all, see :ref:`install_redis_label`. -On Debian/Ubuntu/Mint install ``redis-server`` and ``php5-redis``. The installer +On Debian/Ubuntu/Mint install ``redis-server`` and ``php5-redis`` or ``php7.0-redis``. The installer will automatically launch ``redis-server`` and configure it to launch at startup. From 748c45704ca79f6a8d6c5e0613fe41af07552fb0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 5 Jan 2017 10:15:23 +0100 Subject: [PATCH 3/4] FIx typo Signed-off-by: Joas Schilling --- admin_manual/configuration_server/caching_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst index 2f9026d70..42e7314e1 100644 --- a/admin_manual/configuration_server/caching_configuration.rst +++ b/admin_manual/configuration_server/caching_configuration.rst @@ -47,7 +47,7 @@ distributions it is enabled by default. However, it does not bundle a data cache. APCu is a data cache, and it is available in most Linux distributions. On Red Hat/CentOS/Fedora systems install ``php-pecl-apcu``. On Debian/Ubuntu/Mint systems install ``php5-apcu`` or ``php7.0-apcu``. -On Ubuntu 14.04LTS, the APCu version (4.0.2) is too old to use with Nextcloud (requires 4.0.6+). +On Ubuntu 14.04 LTS, the APCu version (4.0.2) is too old to use with Nextcloud (requires 4.0.6+). You may install 4.0.7 from Ubuntu backports with this command:: apt-get install php5-apcu/trusty-backports From 66aa779a86be909361f418906b038a69dcba1096 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 5 Jan 2017 10:40:31 +0100 Subject: [PATCH 4/4] Downstream of https://github.com/owncloud/documentation/pull/2700 Signed-off-by: Joas Schilling --- .../linux_database_configuration.rst | 2 +- admin_manual/configuration_files/external_storage/smb.rst | 4 ++-- .../configuration_server/caching_configuration.rst | 6 +++--- .../configuration_server/config_sample_php_parameters.rst | 2 +- .../configuration_server/security_setup_warnings.rst | 2 +- admin_manual/installation/source_installation.rst | 4 ++-- developer_manual/app/info.rst | 8 ++++---- 7 files 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 6e5b5addf..2f7ed64d0 100644 --- a/admin_manual/configuration_database/linux_database_configuration.rst +++ b/admin_manual/configuration_database/linux_database_configuration.rst @@ -175,7 +175,7 @@ You can quit the prompt by entering:: \q An 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, +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 this: diff --git a/admin_manual/configuration_files/external_storage/smb.rst b/admin_manual/configuration_files/external_storage/smb.rst index 41ffaf686..708206260 100644 --- a/admin_manual/configuration_files/external_storage/smb.rst +++ b/admin_manual/configuration_files/external_storage/smb.rst @@ -58,8 +58,8 @@ changes made to the storage in near real-time. reliably on Windows SMB servers. .. note:: Using update notifications requires ``smbclient`` 4.x or newer. - Due to limitations with the smbclient php module, the ``smbclient`` binary - is required even when using the php module. + Due to limitations with the smbclient PHP module, the ``smbclient`` binary + is required even when using the PHP module. To start listening to update notifications, start the ``occ`` command like this:: diff --git a/admin_manual/configuration_server/caching_configuration.rst b/admin_manual/configuration_server/caching_configuration.rst index 42e7314e1..be726530e 100644 --- a/admin_manual/configuration_server/caching_configuration.rst +++ b/admin_manual/configuration_server/caching_configuration.rst @@ -27,7 +27,7 @@ of memcache that best fits your needs. The supported caching backends are: A local cache for systems. * `Memcached `_ Distributed cache for multi-server Nextcloud installations. -* `Redis `_, PHP module 2.2.5 and up required. +* `Redis `_, PHP module 2.2.6 and up required. For distributed caching. Memcaches must be explicitly configured in Nextcloud by installing @@ -109,7 +109,7 @@ as a local cache for :doc:`Transactional File Locking <../configuration_files/files_locking_transactional>` because it guarantees that cached objects are available for as long as they are needed. -The Redis PHP module must be version 2.2.5+. If you are running a Linux +The Redis PHP module must be version 2.2.6+. If you are running a Linux distribution that does not package the supported versions of this module, or does not package Redis at all, see :ref:`install_redis_label`. @@ -219,7 +219,7 @@ These instructions are adaptable for any distro that does not package the supported version, or that does not package Redis at all, such as SUSE Linux Enterprise Server and Red Hat Enterprise Linux. -The Redis PHP module must be at least version 2.2.5. Please note that +The Redis PHP module must be at least version 2.2.6. Please note that the Redis PHP module versions 2.2.x will only work for PHP 5.6.x. For PHP 7.0 and PHP 7.1 use Redis PHP module 3.1.x or later. diff --git a/admin_manual/configuration_server/config_sample_php_parameters.rst b/admin_manual/configuration_server/config_sample_php_parameters.rst index f9cf7fb9b..21ed26808 100644 --- a/admin_manual/configuration_server/config_sample_php_parameters.rst +++ b/admin_manual/configuration_server/config_sample_php_parameters.rst @@ -1466,7 +1466,7 @@ Set the time-to-live for locks in secconds. Any lock older than this will be automatically cleaned up. -If not set this defaults to either 1 hour or the php max_execution_time, whichever is higher. +If not set this defaults to either 1 hour or the PHP max_execution_time, whichever is higher. :: diff --git a/admin_manual/configuration_server/security_setup_warnings.rst b/admin_manual/configuration_server/security_setup_warnings.rst index 9f39429fd..51873b9af 100644 --- a/admin_manual/configuration_server/security_setup_warnings.rst +++ b/admin_manual/configuration_server/security_setup_warnings.rst @@ -17,7 +17,7 @@ extensions: * APCu (minimum required PHP extension version 4.0.6) * Memcached -* Redis (minimum required PHP extension version: 2.2.5) +* Redis (minimum required PHP extension version: 2.2.6) You will see this warning if you have no caches installed and enabled, or if your cache does not have the required minimum version installed; older versions diff --git a/admin_manual/installation/source_installation.rst b/admin_manual/installation/source_installation.rst index 9205e0975..5974b8b44 100644 --- a/admin_manual/installation/source_installation.rst +++ b/admin_manual/installation/source_installation.rst @@ -40,7 +40,7 @@ If you get a result, the module is present. Required: -* php (>= 5.6, 7.0 or 7.1) +* PHP (>= 5.6, 7.0 or 7.1) * PHP module ctype * PHP module dom * PHP module GD @@ -89,7 +89,7 @@ memcaches: * PHP module apcu (>= 4.0.6) * PHP module memcached -* PHP module redis (>= 2.2.5, required for Transactional File Locking) +* PHP module redis (>= 2.2.6, required for Transactional File Locking) See :doc:`../configuration_server/caching_configuration` to learn how to select and configure a memcache. diff --git a/developer_manual/app/info.rst b/developer_manual/app/info.rst index f2d8489dc..88946275c 100644 --- a/developer_manual/app/info.rst +++ b/developer_manual/app/info.rst @@ -159,7 +159,7 @@ properly. As soon as one of these requirements is not met the app cannot be inst php === -Defines the minimum and the maximum version of php which is required to run this app. +Defines the minimum and the maximum version of PHP which is required to run this app. database ======== @@ -170,16 +170,16 @@ In case no database is specified it is assumed that all databases are supported. command ======= Defines a command line tool to be available. With the attribute 'os' the required operating system for this tool can be -specified. Valid values for the 'os' attribute are as returned by the php function `php_uname `_. +specified. Valid values for the 'os' attribute are as returned by the PHP function `php_uname `_. lib === -Defines a required php extension with required minimum and/or maximum version. The names for the libraries have to match the result as returned by the php function `get_loaded_extensions `_. +Defines a required PHP extension with required minimum and/or maximum version. The names for the libraries have to match the result as returned by the PHP function `get_loaded_extensions `_. The explicit version of an extension is read from `phpversion `_ - with some exception as to be read up in the `code base `_ os == -Defines the required target operating system the app can run on. Valid values are as returned by the php function `php_uname `_. +Defines the required target operating system the app can run on. Valid values are as returned by the PHP function `php_uname `_. owncloud ========