From e5abd3632f059c4e151fe488426e70936b1a3f96 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 May 2019 14:52:30 +0200 Subject: add httpd and nginx configuration files for FPM in documentation --- php56.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/php56.spec b/php56.spec index 6032383..fdc563d 100644 --- a/php56.spec +++ b/php56.spec @@ -166,8 +166,8 @@ Source7: php-fpm.logrotate Source8: php-fpm.sysconfig Source9: php.modconf Source10: php.ztsmodconf -Source11: strip.sh -Source12: php.conf2 +Source11: php.conf2 +Source12: strip.sh Source13: nginx-fpm.conf Source14: nginx-php.conf # Configuration files for some extensions @@ -1559,7 +1559,18 @@ cat %{SOURCE10} >>$RPM_BUILD_ROOT%{_httpd_modconfdir}/10-php.conf install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf %endif %if %{with_httpd2410} -cat %{SOURCE12} >>$RPM_BUILD_ROOT%{_httpd_confdir}/php.conf +cat %{SOURCE11} >>$RPM_BUILD_ROOT%{_httpd_confdir}/php.conf +%else +mkdir _fpmdoc +cat %{SOURCE1} %{SOURCE11} >_fpmdoc/httpd-php.conf +cat << 'EOF' >_fpmdoc/README +To use FPM with Apache HTTP server: +- copy the httpd-php.conf to %{_httpd_confdir} + +Tu use FPM with NGINX web server: +- copy the nginx-fpm.conf to %{_sysconfdir}/nginx/conf.d +- copy the nginx-php.conf to %{_sysconfdir}/nginx/default.d +EOF %endif install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d @@ -1636,6 +1647,9 @@ sed -e 's@127.0.0.1:9000@unix:/run/php-fpm/www.sock@' \ # Apache sed -e 's@proxy:fcgi://127.0.0.1:9000@proxy:unix:/run/php-fpm/www.sock|fcgi://localhost@' \ -i $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf +%else +install -D -m 644 %{SOURCE13} _fpmdoc/nginx-fpm.conf +install -D -m 644 %{SOURCE14} _fpmdoc/nginx-php.conf %endif # Generate files lists and stub .ini files for each subpackage @@ -1933,6 +1947,8 @@ EOF %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache %if %{with_httpd2410} %config(noreplace) %{_httpd_confdir}/php.conf +%else +%doc _fpmdoc/* %endif %config(noreplace) %{_sysconfdir}/php-fpm.conf %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf -- cgit