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
commit098409c7e36c0e2b19199a678c4d5237016253ca (patch)
tree7a7e080b4a174aa413e280c09d16234837b5e9d2
parentaadefc1d68f86d1d52fe36ab515fbbf931f080ae (diff)
fpm: switch to UDS on Fedora >= 21
-rw-r--r--php.spec14
1 files changed, 14 insertions, 0 deletions
diff --git a/php.spec b/php.spec
index d7687db..4e882f9 100644
--- a/php.spec
+++ b/php.spec
@@ -1259,6 +1259,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
@@ -1631,6 +1642,9 @@ EOF
%changelog
+* Wed Dec 16 2015 Remi Collet <remi@fedoraproject.org> 5.4.45-2.1
+- fpm: switch to UDS on Fedora >= 21
+
* Wed Sep 30 2015 Remi Collet <remi@fedoraproject.org> 5.4.45-2
- Fix bug #70433 - Uninitialized pointer in phar_make_dirstream
when zip entry filename is "/"