provide php.conf with php-fpm, allow apache + fpm to work with default configuration, without mod_php
This commit is contained in:
Remi Collet
parent
57cc2b86cd
commit
6e876c11b7
7
php.conf
7
php.conf
@ -41,3 +41,10 @@ DirectoryIndex index.php
|
||||
php_value session.save_path "/var/lib/php/session"
|
||||
php_value soap.wsdl_cache_dir "/var/lib/php/wsdlcache"
|
||||
</IfModule>
|
||||
|
||||
# Redirect to local php-fpm is mod_php not available
|
||||
<IfModule !mod_php5.c>
|
||||
<FilesMatch \.php$>
|
||||
SetHandler "proxy:fcgi://127.0.0.1:9000"
|
||||
</FilesMatch>
|
||||
</IfModule>
|
||||
|
||||
47
php.spec
47
php.spec
@ -36,14 +36,8 @@
|
||||
%global isasuffix %nil
|
||||
%endif
|
||||
|
||||
# /usr/sbin/apsx with httpd < 2.4 and defined as /usr/bin/apxs with httpd >= 2.4
|
||||
%{!?_httpd_apxs: %{expand: %%global _httpd_apxs %%{_sbindir}/apxs}}
|
||||
# needed at srpm build time, when httpd-devel not yet installed
|
||||
%{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}}
|
||||
%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
|
||||
# /etc/httpd/conf.d with httpd < 2.4 and defined as /etc/httpd/conf.modules.d with httpd >= 2.4
|
||||
%{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.d}}
|
||||
%{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}}
|
||||
%{!?_httpd_contentdir: %{expand: %%global _httpd_contentdir /var/www}}
|
||||
|
||||
%global with_dtrace 1
|
||||
|
||||
@ -132,6 +126,8 @@ Patch302: php-5.6.0-noNO.patch
|
||||
|
||||
BuildRequires: bzip2-devel, curl-devel >= 7.9
|
||||
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
|
||||
# to ensure we are using httpd with filesystem feature (see #1081453)
|
||||
BuildRequires: httpd-filesystem
|
||||
BuildRequires: libstdc++-devel, openssl-devel
|
||||
BuildRequires: sqlite-devel >= 3.6.0
|
||||
BuildRequires: zlib-devel, smtpdaemon, libedit-devel
|
||||
@ -157,15 +153,7 @@ Requires: php-common%{?_isa} = %{version}-%{release}
|
||||
# For backwards-compatibility, require php-cli for the time being:
|
||||
Requires: php-cli%{?_isa} = %{version}-%{release}
|
||||
# To ensure correct /var/lib/php/session ownership:
|
||||
Requires(pre): httpd
|
||||
|
||||
%if 0%{?fedora} < 20
|
||||
# Don't provides extensions, which are not shared library, as .so
|
||||
%{?filter_provides_in: %filter_provides_in %{_libdir}/php/modules/.*\.so$}
|
||||
%{?filter_provides_in: %filter_provides_in %{_libdir}/php-zts/modules/.*\.so$}
|
||||
%{?filter_provides_in: %filter_provides_in %{_httpd_moddir}/.*\.so$}
|
||||
%{?filter_setup}
|
||||
%endif
|
||||
Requires(pre): httpd-filesystem
|
||||
|
||||
|
||||
%description
|
||||
@ -216,6 +204,10 @@ Requires: systemd-units
|
||||
Requires(post): systemd-units
|
||||
Requires(preun): systemd-units
|
||||
Requires(postun): systemd-units
|
||||
# To ensure correct /var/lib/php/session ownership:
|
||||
Requires(pre): httpd-filesystem
|
||||
# For php.conf in /etc/httpd/conf.d
|
||||
Requires: httpd-filesystem
|
||||
|
||||
%description fpm
|
||||
PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI
|
||||
@ -1177,21 +1169,12 @@ install -m 755 build-zts/libs/libphp5.so $RPM_BUILD_ROOT%{_httpd_moddir}/libphp5
|
||||
%endif
|
||||
|
||||
# Apache config fragment
|
||||
%if "%{_httpd_modconfdir}" == "%{_httpd_confdir}"
|
||||
# Single config file with httpd < 2.4 (fedora <= 17)
|
||||
install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf
|
||||
%if %{with_zts}
|
||||
cat %{SOURCE10} >>$RPM_BUILD_ROOT%{_httpd_confdir}/php.conf
|
||||
%endif
|
||||
cat %{SOURCE1} >>$RPM_BUILD_ROOT%{_httpd_confdir}/php.conf
|
||||
%else
|
||||
# Dual config file with httpd >= 2.4 (fedora >= 18)
|
||||
install -D -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-php.conf
|
||||
%if %{with_zts}
|
||||
cat %{SOURCE10} >>$RPM_BUILD_ROOT%{_httpd_modconfdir}/10-php.conf
|
||||
%endif
|
||||
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/php.conf
|
||||
%endif
|
||||
|
||||
install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
|
||||
%if %{with_zts}
|
||||
@ -1342,15 +1325,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
|
||||
rm -f README.{Zeus,QNX,CVS-RULES}
|
||||
|
||||
|
||||
%pre fpm
|
||||
# Add the "apache" user as we don't require httpd
|
||||
getent group apache >/dev/null || \
|
||||
groupadd -g 48 -r apache
|
||||
getent passwd apache >/dev/null || \
|
||||
useradd -r -u 48 -g apache -s /sbin/nologin \
|
||||
-d %{_httpd_contentdir} -c "Apache" apache
|
||||
exit 0
|
||||
|
||||
%post fpm
|
||||
%systemd_post php-fpm.service
|
||||
|
||||
@ -1371,9 +1345,7 @@ exit 0
|
||||
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
|
||||
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache
|
||||
%config(noreplace) %{_httpd_confdir}/php.conf
|
||||
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
|
||||
%config(noreplace) %{_httpd_modconfdir}/10-php.conf
|
||||
%endif
|
||||
%{_httpd_contentdir}/icons/php.gif
|
||||
|
||||
%files common -f files.common
|
||||
@ -1422,6 +1394,7 @@ exit 0
|
||||
%license fpm_LICENSE
|
||||
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session
|
||||
%attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache
|
||||
%config(noreplace) %{_httpd_confdir}/php.conf
|
||||
%config(noreplace) %{_sysconfdir}/php-fpm.conf
|
||||
%config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/php-fpm
|
||||
@ -1500,6 +1473,8 @@ exit 0
|
||||
- cleanup with_libmysql
|
||||
- fix licenses handling
|
||||
- fix zts-php-config --php-binary output #1124605
|
||||
- provide php.conf with php-fpm, allow apache + fpm
|
||||
to work with default configuration, without mod_php
|
||||
|
||||
* Mon Jul 7 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.3.RC2
|
||||
- php 5.6.0RC2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user