diff options
| author | Remi Collet <remi@remirepo.net> | 2018-03-21 10:32:19 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-03-21 10:32:19 +0100 |
| commit | 237eab9a582526af3817e2a494228b83691a8eda (patch) | |
| tree | af4705308355ecc30db93302cfcac3b975b69ac9 | |
| parent | bbe93f2fa0c052de86cbf104c5969286623b2fae (diff) | |
use systemd RuntimeDirectory instead of /etc/tmpfiles.d
| -rw-r--r-- | php-fpm.service | 2 | ||||
| -rw-r--r-- | php71.spec | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/php-fpm.service b/php-fpm.service index 687dfc0..b68765f 100644 --- a/php-fpm.service +++ b/php-fpm.service @@ -12,6 +12,8 @@ EnvironmentFile=/etc/sysconfig/php-fpm ExecStart=/usr/sbin/php-fpm --nodaemonize ExecReload=/bin/kill -USR2 $MAINPID PrivateTmp=true +RuntimeDirectory=php-fpm +RuntimeDirectoryMode=0755 [Install] WantedBy=multi-user.target @@ -113,7 +113,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 2%{?dist} +Release: 3%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1136,9 +1136,6 @@ rm -f TSRM/tsrm_win32.h \ find . -name \*.[ch] -exec chmod 644 {} \; chmod 644 README.* -# php-fpm configuration files for tmpfiles.d -echo "d /run/php-fpm 755 root root" >php-fpm.tmpfiles - # Some extensions have their own configuration file cp %{SOURCE50} 10-opcache.ini %if 0%{?rhel} != 6 @@ -1642,9 +1639,6 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/php-fpm %if %{with_systemd} install -m 755 -d $RPM_BUILD_ROOT/run/php-fpm -# tmpfiles.d -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 # this folder requires systemd >= 204 install -m 755 -d $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/php-fpm.service.d @@ -1972,14 +1966,13 @@ fi %config(noreplace) %{_sysconfdir}/nginx/default.d/php.conf %endif %if %{with_systemd} -%{_prefix}/lib/tmpfiles.d/php-fpm.conf %{_unitdir}/php-fpm.service %if 0%{?fedora} >= 27 %{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf %{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf %endif %dir %{_sysconfdir}/systemd/system/php-fpm.service.d -%dir /run/php-fpm +%dir %ghost /run/php-fpm %else %{_initrddir}/php-fpm %dir %{_localstatedir}/run/php-fpm @@ -2060,6 +2053,9 @@ fi %changelog +* Wed Mar 21 2018 Remi Collet <remi@remirepo.net> - 7.1.16~RC1-3 +- use systemd RuntimeDirectory instead of /etc/tmpfiles.d + * Thu Mar 15 2018 Remi Collet <remi@remirepo.net> - 7.1.16~RC1-2 - add file trigger to restart the php-fpm service when new pool or new extension installed (F27+) |