From 306107d1c6a60252a2113887eb37b1c8f51e24c5 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 4 Aug 2018 13:59:52 +0200 Subject: [PATCH] Documentation about new php default configuration --- docs/configuration-files/php-fpm-conf.rst | 24 ++++++++++++++++++++--- docs/configuration-files/php-ini.rst | 19 +++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/docs/configuration-files/php-fpm-conf.rst b/docs/configuration-files/php-fpm-conf.rst index f22eec4a..6307350c 100644 --- a/docs/configuration-files/php-fpm-conf.rst +++ b/docs/configuration-files/php-fpm-conf.rst @@ -44,12 +44,30 @@ See the directory structure for PHP-FPM configuration directories inside ``./cfg Customization is achieved by placing a file into ``cfg/php-fpm-X.X/`` (where ``X.X`` stands for your PHP version). The file must end by ``.conf`` in order to be sourced by the PHP-FPM server. -Each of the PHP-FPM conf configuration directories already contain an example file: -``devilbox-custom.conf-example``, that can simply be renamed to ``devilbox-custom.conf``. -This file holds some example values that can be adjusted or commented out. +Each of the PHP-FPM conf configuration directories already contains three example file: +``devilbox-fpm.conf-default``, ``devilbox-fpm.conf-pm_dynamic`` and ``devilbox-fpm.conf-pm_ondemand``. + +**devilbox-fpm.conf-default** + +This file holds the exact settings that are currently in place by each PHP-FPM container. +Copy it (do not simply rename it) to a different file ending by ``.conf`` and start adjusting it. + +**devilbox-fpm.conf-pm_dynamic** + +This file holds some sane example configuration to switch PHP-FPM scheduler to ``dynamic`` +(The default is ``ondemand``). +Copy it (do not simply rename it) to a different file ending by ``.conf`` and start adjusting it. + +**devilbox-fpm.conf-pm_ondemand** + +This file holds the current default values for the PHP-FPM scheduler which is using ``ondemand``. +Copy it (do not simply rename it) to a different file ending by ``.conf`` and start adjusting it. + +**How to apply the settings** In order for the changes to be applied, you will have to restart the Devilbox. + .. seealso:: To find out about all available PHP-FPM directives, global or pool specific have a look at its documentation: https://secure.php.net/manual/en/install.fpm.configuration.php diff --git a/docs/configuration-files/php-ini.rst b/docs/configuration-files/php-ini.rst index b6e74a43..53d16617 100644 --- a/docs/configuration-files/php-ini.rst +++ b/docs/configuration-files/php-ini.rst @@ -37,9 +37,22 @@ See the directory structure for PHP configuration directories inside ``./cfg/`` Customization is achieved by placing a file into ``cfg/php-ini-X.X/`` (where ``X.X`` stands for your PHP version). The file must end by ``.ini`` in order to be sourced by the PHP-FPM server. -Each of the PHP ini configuration directories already contain an example file: -``devilbox-custom.ini-example``, that can simply be renamed to ``devilbox-custom.ini``. -This file holds some example values that can be adjusted or commented out. +Each of the PHP ini configuration directories already contains two example files: +``devilbox-php.ini-default`` and ``devilbox-php.ini-xdebug``. + +**devilbox-php.ini-default** + +This file holds the exact settings that are currently in place by each PHP-FPM container. +Copy it (do not simply rename it) to a different file ending by ``.ini`` and start adjusting it. + +**devilbox-php.ini-xdebug** + +This file holds some sane example configuration to get you started with Xdebug. +Copy it (do not simply rename it) to a different file ending by ``.ini`` and start adjusting it. + +.. important:: For Xdebug to work, there are other changes requires as well: :ref:`configure_php_xdebug` + +**How to apply the settings** In order for the changes to be applied, you will have to restart the Devilbox.