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
commite6cbc0049f7be3a4f9746dbfbd8ce7bcc2341ba2 (patch)
tree8581c2d3b20bce11bd6a1fe35f98a34539d1ba60
parent975fc36b53874018ee5b4ed83f826f964de9264f (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 48efc22..fce546c 100644
--- a/php.spec
+++ b/php.spec
@@ -1389,6 +1389,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
@@ -1792,6 +1803,7 @@ fi
%changelog
* Mon Dec 14 2015 Remi Collet <remi@fedoraproject.org> 5.6.17-0.2.RC1
- curl: add CURL_SSLVERSION_TLSv1_x constant
+- fpm: switch to UDS on Fedora >= 21
* Thu Dec 10 2015 Remi Collet <remi@fedoraproject.org> 5.6.17-0.1.RC1
- update to 5.6.17RC1