From d2480702a18a72aca8efbed3aecd1264f92d13f5 Mon Sep 17 00:00:00 2001 From: iliajie Date: Wed, 20 Jul 2022 17:43:30 +0300 Subject: [PATCH] Add improvements for searching and naming PHP configs (from master) --- phpini/config | 2 +- phpini/config-Ubuntu-Linux-20.0-ALL | 1 + phpini/config-debian-linux-10.0-ALL | 1 + ...{config-debian-linux-4.0-ALL => config-debian-linux-4.0-9.0} | 0 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 phpini/config-Ubuntu-Linux-20.0-ALL create mode 100644 phpini/config-debian-linux-10.0-ALL rename phpini/{config-debian-linux-4.0-ALL => config-debian-linux-4.0-9.0} (100%) diff --git a/phpini/config b/phpini/config index 1f185021e..52a306c27 100644 --- a/phpini/config +++ b/phpini/config @@ -1 +1 @@ -php_ini=/etc/php.ini +php_ini=/etc/php.ini,/etc/*/*/php*/php.ini,/etc/*/*/*php*/php.ini=Configuration for CLI and CGI /etc/php-fpm.conf,/etc/*/php*/php-fpm.conf,/etc/*/*/php*/php-fpm.conf=Configuration for FPM diff --git a/phpini/config-Ubuntu-Linux-20.0-ALL b/phpini/config-Ubuntu-Linux-20.0-ALL new file mode 100644 index 000000000..2da748ae9 --- /dev/null +++ b/phpini/config-Ubuntu-Linux-20.0-ALL @@ -0,0 +1 @@ +php_ini=/etc/php*/cli/php.ini,/etc/php/*/cli/php.ini=Configuration for CLI /etc/php*/fpm/php.ini,/etc/php/*/fpm/php.ini=Configuration for FPM /etc/php*/cgi/php.ini,/etc/php/*/cgi/php.ini=Configuration for CGI /etc/php*/apache2/php.ini,/etc/php/*/apache2/php.ini=Configuration for mod_php diff --git a/phpini/config-debian-linux-10.0-ALL b/phpini/config-debian-linux-10.0-ALL new file mode 100644 index 000000000..14c317a0d --- /dev/null +++ b/phpini/config-debian-linux-10.0-ALL @@ -0,0 +1 @@ +php_ini=/etc/php*/cli/php.ini,/etc/php/*/cli/php.ini=Configuration for CLI /etc/php*/fpm/php.ini,/etc/php/*/fpm/php.ini=Configuration for FPM /etc/php*/cgi/php.ini,/etc/php/*/cgi/php.ini=Configuration for CGI /etc/php*/apache2/php.ini,/etc/php/*/apache2/php.ini=Configuration for mod_php diff --git a/phpini/config-debian-linux-4.0-ALL b/phpini/config-debian-linux-4.0-9.0 similarity index 100% rename from phpini/config-debian-linux-4.0-ALL rename to phpini/config-debian-linux-4.0-9.0