From 1062eff4b7e898b7c173159eb8876c61c6079918 Mon Sep 17 00:00:00 2001 From: Jos Poortvliet Date: Sat, 10 Dec 2016 11:36:23 +0100 Subject: [PATCH 1/2] Update deployment_recommendations.rst remove idiotic 'edition' stuff (we don't do closed source, yay) and make note of the php-fpm and nginx possibility. --- .../deployment_recommendations.rst | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/admin_manual/installation/deployment_recommendations.rst b/admin_manual/installation/deployment_recommendations.rst index e05e095bf..93bd39005 100644 --- a/admin_manual/installation/deployment_recommendations.rst +++ b/admin_manual/installation/deployment_recommendations.rst @@ -27,8 +27,12 @@ keep individual Nextcloud instances to a manageable size. * PHP 5.5+. PHP 5.4 is the minimum supported version; note that it reached end-of-life in September 2015 and is no longer supported by the PHP team. Some Linux vendors, such as Red Hat, still support PHP 5.4. - 5.6+ is recommended. ``mod_php`` is the recommended Apache module because it - provides the best performance. + 5.6+ is recommended. PHP 7 is known to offer significan performance + advantages. ``mod_php`` is the recommended Apache module due to + vendor support and ease of configuration. ``php-fpm`` with Apache Event + MPM (or nginx) is an alternative with potentially better scalability in + high load and limited RAM environments. For the best results we recommend + working with the Nextcloud GmbH enterprise suppor team for large deployments. .. comment: mod_php is easier to set up, php-fpm with apache event MPM seems to scale better under load and limited RAM restrictions: @@ -117,10 +121,6 @@ Authentication via an existing LDAP or Active Directory server. * Storage Local storage. -* Nextcloud Edition - Standard Edition. (See `Nextcloud Server or Enterprise Edition`_ for - comparisons of the Nextcloud editions.) - Mid-sized Enterprises --------------------- @@ -224,10 +224,6 @@ Authentication via an existing LDAP or Active Directory server. * Storage Use an off-the-shelf NFS solution, such as IBM Elastic Storage or RedHat Ceph. - -* Nextcloud Edition - Enterprise Edition. (See `Nextcloud Server or Enterprise Edition`_ for - comparisons of the Nextcloud editions.) Large Enterprises and Service Providers --------------------------------------- @@ -310,10 +306,6 @@ Authentication via an existing LDAP or Active Directory server, or SAML. An off-the-shelf NFS solution should be used. Examples are IBM Elastic Storage or RedHAT Ceph. Optionally, an S3 compatible object store can also be used. - -* Nextcloud Edition - Enterprise Edition. (See `Nextcloud Server or Enterprise Edition`_ for - comparisons of the Nextcloud editions.) Hardware Considerations ----------------------- From ce5031fc7c9c9a6d1635e5f76be86521eea6dbbf Mon Sep 17 00:00:00 2001 From: Jos Poortvliet Date: Sun, 11 Dec 2016 20:15:14 +0100 Subject: [PATCH 2/2] Update deployment_recommendations.rst --- admin_manual/installation/deployment_recommendations.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/admin_manual/installation/deployment_recommendations.rst b/admin_manual/installation/deployment_recommendations.rst index 93bd39005..90078e1bc 100644 --- a/admin_manual/installation/deployment_recommendations.rst +++ b/admin_manual/installation/deployment_recommendations.rst @@ -24,10 +24,8 @@ keep individual Nextcloud instances to a manageable size. * Operating system: Linux. * Web server: Apache 2.4. * Database: MySQL/MariaDB. -* PHP 5.5+. PHP 5.4 is the minimum supported version; note that it reached - end-of-life in September 2015 and is no longer supported by the PHP team. - Some Linux vendors, such as Red Hat, still support PHP 5.4. - 5.6+ is recommended. PHP 7 is known to offer significan performance +* PHP 5.6+. PHP 5.6 is the minimum supported version. We recommend to deploy + on PHP 7 if possible. This version is known to offer significan performance advantages. ``mod_php`` is the recommended Apache module due to vendor support and ease of configuration. ``php-fpm`` with Apache Event MPM (or nginx) is an alternative with potentially better scalability in