diff options
| author | Remi Collet <remi@remirepo.net> | 2025-11-17 08:41:01 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-11-17 08:41:01 +0100 |
| commit | b49f811f0811b3909c812675391d0c46ef153ab7 (patch) | |
| tree | 4a0e0959cd962de4817fa80278eae96ddc105c94 | |
| parent | e2f5a31025551d8f9778f2a1490290c835a0e7ee (diff) | |
move httpd/nginx drop-ins back to /usr/lib/systemd/system #2415127
| -rw-r--r-- | php-fpm.wants | 9 | ||||
| -rw-r--r-- | php.spec | 15 |
2 files changed, 18 insertions, 6 deletions
diff --git a/php-fpm.wants b/php-fpm.wants index 5c7c8e4..2b4e775 100644 --- a/php-fpm.wants +++ b/php-fpm.wants @@ -1,3 +1,12 @@ +# This file provides default configuration and will be overwritten on package upgrades. +# Do not edit it directly. +# +# To customize: +# 1. Copy this file, preserving its name, to /etc/systemd/system/<unit>.d/ +# (create the directory if it does not exist) +# 2. Edit the copy as needed +# 3. Run: systemctl daemon-reload + [Unit] Wants=php-fpm.service @@ -108,7 +108,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lowrc:~%{lowrc}}%{?gh_date:.%{gh_date}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1332,9 +1332,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/www.conf.default . # 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 install -Dm 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service -install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/httpd.service.d/%{?scl_prefix}php-fpm.conf -install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/nginx.service.d/%{?scl_prefix}php-fpm.conf -sed -e 's/php-fpm/%{?scl_prefix}php-fpm/' -i $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/*.service.d/%{?scl_prefix}php-fpm.conf +install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf +install -Dm 644 %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf +sed -e 's/php-fpm/%{?scl_prefix}php-fpm/' -i $RPM_BUILD_ROOT%{_unitdir}/*.service.d/%{?scl_prefix}php-fpm.conf sed -e 's:/run:%{_localstatedir}/run:' \ -e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \ -e 's:/usr/sbin:%{_sbindir}:' \ @@ -1589,8 +1589,8 @@ fi # {_prefix}/lib/tmpfiles.d/php-fpm.conf %{_unitdir}/%{?scl_prefix}php-fpm.service %dir %{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d -%config(noreplace) %{_root_sysconfdir}/systemd/system/httpd.service.d/%{?scl_prefix}php-fpm.conf -%config(noreplace) %{_root_sysconfdir}/systemd/system/nginx.service.d/%{?scl_prefix}php-fpm.conf +%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf +%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf %{_sbindir}/php-fpm %dir %{_sysconfdir}/php-fpm.d # log owned by apache for log @@ -1657,6 +1657,9 @@ fi %changelog +* Mon Nov 17 2025 Remi Collet <remi@remirepo.net> - 8.5.0~rc5-2 +- move httpd/nginx drop-ins back to /usr/lib/systemd/system #2415127 + * Wed Nov 12 2025 Remi Collet <remi@remirepo.net> - 8.5.0~rc5-1 - update to 8.5.0RC5 |