summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-12-16 11:38:55 +0100
committerRemi Collet <fedora@famillecollet.com>2015-12-16 11:38:55 +0100
commitbdb3bb3d6608b5624c90dee207f1eac040b07cc2 (patch)
treeb740ca2607c30e7924a51213ba7c9aea3d0e898f
parent163f1686716e4214ee5dab2092bdf302120f30f3 (diff)
fpm: switch to UDS on Fedora >= 21
-rw-r--r--php.spec12
1 files changed, 12 insertions, 0 deletions
diff --git a/php.spec b/php.spec
index a724d7a..6eec9c7 100644
--- a/php.spec
+++ b/php.spec
@@ -1412,6 +1412,17 @@ sed -e '/php-fpm.pid/s:/var:%{_localstatedir}:' \
-i $RPM_BUILD_ROOT%{_root_initddir}/%{?scl_prefix}php-fpm
%endif
+%if %{with_httpd2410}
+# Switch to UDS
+# FPM
+sed -e 's@127.0.0.1:9000@/run/php-fpm/www.sock@' \
+ -e 's@^;listen.acl_users@listen.acl_users@' \
+ -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf
+# 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}/%{name}.conf
+%endif
+
# LogRotate
install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm
@@ -1797,6 +1808,7 @@ fi
%changelog
* Mon Dec 14 2015 Remi Collet <remi@fedoraproject.org> 7.0.1-0.2.0RC1
- curl: add CURL_SSLVERSION_TLSv1_x constant
+- fpm: switch to UDS on Fedora >= 21
* Wed Dec 9 2015 Remi Collet <remi@fedoraproject.org> 7.0.1-0.1.0RC1
- Update to 7.0.1RC1