From 0238007d88969f5e58c6da0df26260e79e1d1ebf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Dec 2022 11:03:33 +0100 Subject: [PATCH] php-fpm.conf: move include directive after [global] section following upstream example --- php-fpm.conf | 10 ++++------ php.spec | 6 +++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/php-fpm.conf b/php-fpm.conf index 53a07b6..750f987 100644 --- a/php-fpm.conf +++ b/php-fpm.conf @@ -5,11 +5,6 @@ ; All relative paths in this configuration file are relative to PHP's install ; prefix. -; Include one or more files. If glob(3) exists, it is used to include a bunch of -; files from a glob(3) pattern. This directive can be used everywhere in the -; file. -include=/etc/php-fpm.d/*.conf - ;;;;;;;;;;;;;;;;;; ; Global Options ; ;;;;;;;;;;;;;;;;;; @@ -133,5 +128,8 @@ daemonize = yes ; used in logs and stats. There is no limitation on the number of pools which ; FPM can handle. Your system will tell you anyway :) -; See /etc/php-fpm.d/*.conf +; Include one or more files. If glob(3) exists, it is used to include a bunch of +; files from a glob(3) pattern. This directive can be used everywhere in the +; file. +include=/etc/php-fpm.d/*.conf diff --git a/php.spec b/php.spec index 253e403..e949a91 100644 --- a/php.spec +++ b/php.spec @@ -70,7 +70,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1543,6 +1543,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %changelog +* Mon Dec 19 2022 Remi Collet - 8.2.1~RC1-2 +- php-fpm.conf: move include directive after [global] section + following upstream example + * Wed Dec 14 2022 Remi Collet - 8.2.1~RC1-1 - update to 8.2.1RC1