diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-05-23 16:14:51 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-05-23 16:14:51 +0200 |
| commit | 61ec3ced0b3e258c8c0dfcca4e0d3049d2f7a1c6 (patch) | |
| tree | 5478c0c51a3dc8eee9b4cfdd1d7b20ae88410cf8 | |
| parent | 1f6127754d44fd20ff32ffa33e8ff6995acad9ac (diff) | |
php: minor changes from rawhide
| -rw-r--r-- | php-fpm.sysconfig | 8 | ||||
| -rw-r--r-- | php55.spec | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/php-fpm.sysconfig b/php-fpm.sysconfig index adc3d62..04314e1 100644 --- a/php-fpm.sysconfig +++ b/php-fpm.sysconfig @@ -3,15 +3,17 @@ # This file is deprecated when systemd is used and # will be removed in the future -# To alter FPM environment, copy the unit file +# To alter the FPM environment, copy the unit file # from /usr/lib/systemd/system/php-fpm.service # to /etc/systemd/system/php-fpm.service # and add an Environment line -# With systemd >= 204 you can simply drop a file -# in /etc/systemd/system/php-fpm.service.d, with +# 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 @@ -1450,6 +1450,10 @@ install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm install -m 755 -d $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d install -m 644 php-fpm.tmpfiles $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/php-fpm.conf # install systemd unit files and scripts for handling server startup +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +# this folder requires systemd >= 204 +install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/php-fpm.service.d +%endif install -m 755 -d $RPM_BUILD_ROOT%{_unitdir} install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/ %if 0%{?fedora} < 16 && 0%{?rhel} < 7 @@ -1739,6 +1743,9 @@ fi %if %{with_systemd} %{_prefix}/lib/tmpfiles.d/php-fpm.conf %{_unitdir}/php-fpm.service +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%dir %{_sysconfdir}/systemd/system/php-fpm.service.d +%endif %dir /run/php-fpm %else %{_initrddir}/php-fpm |