diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-03-13 13:54:30 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-03-13 13:54:30 +0100 |
| commit | 0b9f31947c389038755a6cf364be65547d2e25da (patch) | |
| tree | 01a44e8f92705c82c3d0bf197bf93d99946402fb | |
| parent | d4b5fc431fae629bfc20d97f686227fab74c1fdc (diff) | |
php: cleanup PIDFile and EnvironmentFile
| -rw-r--r-- | php-fpm.service | 1 | ||||
| -rw-r--r-- | php.spec | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/php-fpm.service b/php-fpm.service index b4d528f..687dfc0 100644 --- a/php-fpm.service +++ b/php-fpm.service @@ -8,7 +8,6 @@ After=syslog.target network.target [Service] Type=notify -PIDFile=/run/php-fpm/php-fpm.pid EnvironmentFile=/etc/sysconfig/php-fpm ExecStart=/usr/sbin/php-fpm --nodaemonize ExecReload=/bin/kill -USR2 $MAINPID @@ -1441,10 +1441,14 @@ sed -e 's:/run:%{_localstatedir}/run:' \ -i $RPM_BUILD_ROOT%{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm # Environment file +%if 0%{?fedora} >= 26 +sed -e '/EnvironmentFile/d' -i $RPM_BUILD_ROOT%{_root_initddir}/%{?scl_prefix}php-fpm +%else 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 +%endif # make the cli commands available in standard root for SCL build %if 0%{?scl:1} @@ -1714,7 +1718,9 @@ fi %config(noreplace) %{_sysconfdir}/php-fpm.conf %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf %config(noreplace) %{_root_sysconfdir}/logrotate.d/%{?scl_prefix}php-fpm +%if 0%{?fedora} < 26 %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm +%endif # {_prefix}/lib/tmpfiles.d/php-fpm.conf %if %{with_systemd} %{_unitdir}/%{?scl_prefix}php-fpm.service |