pool/apache2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 945375 from home:olh:branches:Apache

Browse Source 
- remove instance units from post scripts, they can not be reloaded

OBS-URL: https://build.opensuse.org/request/show/945375
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=664
This commit is contained in:
Petr Gajdos 2022-01-11 07:57:05 +00:00 committed by Git OBS Bridge
parent f7bd876f97
commit 2312035f9b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2.changes
View File

@ -4,6 +4,11 @@ Mon Jan 10 18:12:38 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Add apache2-perl-io-socket.patch: t/ssl/ocsp.t: Handle new error - Add apache2-perl-io-socket.patch: t/ssl/ocsp.t: Handle new error
message raised by IO-Socket-SSL 2.073. message raised by IO-Socket-SSL 2.073.
-------------------------------------------------------------------
Mon Jan 10 16:16:16 UTC 2022 - olaf@aepfle.de
- remove instance units from post scripts, they can not be reloaded
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 20 11:26:49 UTC 2021 - David Anes <david.anes@suse.com> Mon Dec 20 11:26:49 UTC 2021 - David Anes <david.anes@suse.com>

10
apache2.spec
View File

@ -961,7 +961,7 @@ exit 0
# main package scriptlets # main package scriptlets
%if "%{flavor}" == "" %if "%{flavor}" == ""
%pre %pre
%service_add_pre apache2.service apache2@.service apache2.target %service_add_pre apache2.service apache2.target
exit 0 exit 0
%post %post
@ -971,7 +971,7 @@ if grep -q "^wwwadmin:" %{_sysconfdir}/group; then
usermod -g %{httpdgroup} %{httpduser} 2>/dev/null ||: usermod -g %{httpdgroup} %{httpduser} 2>/dev/null ||:
usermod -s /bin/false %{httpduser} 2>/dev/null ||: usermod -s /bin/false %{httpduser} 2>/dev/null ||:
fi fi
%service_add_post apache2.service apache2@.service apache2.target %service_add_post apache2.service apache2.target
%set_permissions %{_sbindir}/suexec || \ %set_permissions %{_sbindir}/suexec || \
echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec ." echo "Please check %{_sysconfdir}/permissions.local for settings of %{_sbindir}/suexec ."
%{fillup_only apache2} %{fillup_only apache2}
@ -987,15 +987,15 @@ exit 0
%verify_permissions -e %{_sbindir}/suexec %verify_permissions -e %{_sbindir}/suexec
%preun %preun
%service_del_preun apache2.service apache2@.service apache2.target %service_del_preun apache2.service apache2.target
exit 0 exit 0
%postun %postun
%if %{defined service_del_postun_without_restart} %if %{defined service_del_postun_without_restart}
%service_del_postun_without_restart apache2.service apache2@.service apache2.target %service_del_postun_without_restart apache2.service apache2.target
%else %else
DISABLE_RESTART_ON_UPDATE='yes' DISABLE_RESTART_ON_UPDATE='yes'
%service_del_postun apache2.service apache2@.service apache2.target %service_del_postun apache2.service apache2.target
%endif %endif
if [ "$1" = 1 ]; then if [ "$1" = 1 ]; then
%apache_request_restart %apache_request_restart