diff options
| -rw-r--r-- | php-fpm.service | 3 | ||||
| -rw-r--r-- | php-fpm.sysconfig | 12 | ||||
| -rw-r--r-- | php.spec | 15 |
3 files changed, 25 insertions, 5 deletions
diff --git a/php-fpm.service b/php-fpm.service index 41f6bfe..05fc52d 100644 --- a/php-fpm.service +++ b/php-fpm.service @@ -1,6 +1,7 @@ # It's not recommended to modify this file in-place, because it will be # overwritten during package upgrades. If you want to customize, the -# best way is to create a file "/etc/systemd/system/php-fpm.service". +# best way is to drop a file with the suffix .conf in +# /etc/systemd/system/php-fpm.service.d [Unit] Description=The PHP FastCGI Process Manager diff --git a/php-fpm.sysconfig b/php-fpm.sysconfig index 72096da..4099ed6 100644 --- a/php-fpm.sysconfig +++ b/php-fpm.sysconfig @@ -1,2 +1,14 @@ # Additional environment file for php-fpm +# This file is deprecated when systemd is used and +# will be removed in the future + +# With systemd >= 204 you can simply drop a file with the +# suffix .conf in /etc/systemd/system/php-fpm.service.d, with +# [Service] +# Environment=FOO=bar + +# See systemd documentation. +# man systemd.unit +# man systemd.exec + @@ -109,7 +109,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: 5.4.36 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1205,11 +1205,12 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf.default . install -m 755 -d $RPM_BUILD_ROOT%{_unitdir} install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service sed -e 's:/run:%{_localstatedir}/run:' \ - -e 's:/etc:%{_sysconfdir}:' \ + -e 's:/etc/sysconfig:%{_sysconfdir}/sysconfig:' \ + -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \ -e 's:/usr/sbin:%{_sbindir}:' \ -i $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service # this folder requires systemd >= 204 -install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d +install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d %else # Service install -m 755 -d $RPM_BUILD_ROOT%{_root_initddir} @@ -1229,9 +1230,12 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_ sed -e 's:/run:%{_localstatedir}/run:' \ -e 's:/var/log:%{_localstatedir}/log:' \ -i $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm + # Environment file install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm +sed -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \ + -i $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm # Fix the link (cd $RPM_BUILD_ROOT%{_bindir}; ln -sfn phar.phar phar) @@ -1495,7 +1499,7 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm %if %{with_systemd} %{_unitdir}/%{?scl_prefix}php-fpm.service -%dir %{_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d +%dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d %else %{_root_initddir}/%{?scl_prefix}php-fpm %endif @@ -1582,6 +1586,9 @@ fi %changelog +* Tue Jan 20 2015 Remi Collet <rcollet@redhat.com> 5.4.36-1.2 +- fix php-fpm.service.d location + * Mon Dec 22 2014 Remi Collet <remi@fedoraproject.org> 5.4.36-1.1 - allow multiple paths in ini_scan_dir, backported from 5.5 and applied in RHSCL packages |