packages/obs-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!163 fix error info when removed after upgrade

Browse Source 
From: @wk333 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2024-12-06 11:20:29 +00:00 committed by Gitee
commit 23dd209129
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
obs-server.spec
View File

@ -6,7 +6,7 @@
Name: obs-server Name: obs-server
Version: 2.10.15 Version: 2.10.15
Release: 11 Release: 12
Summary: The Open Build Service -- Server Component Summary: The Open Build Service -- Server Component
License: GPL-2.0-only OR GPL-3.0-only License: GPL-2.0-only OR GPL-3.0-only
URL: http://www.openbuildservice.org URL: http://www.openbuildservice.org
@ -216,8 +216,14 @@ exit 0
%systemd_preun obsnotifyforward.service %systemd_preun obsnotifyforward.service
%systemd_preun obsredis.service %systemd_preun obsredis.service
%systemd_preun obsworker.service %systemd_preun obsworker.service
semanage fcontext -d "/srv/obs(/.*)?" Obs_Context=`semanage fcontext -l | grep '/srv/obs(/.*)?' | awk '{print $4}' | awk -F: '{print $3}'`
semanage fcontext -d "/srv/obs/events(/.*)?" if [[ $Obs_Context == "var_lib_t" ]];then
semanage fcontext -d "/srv/obs(/.*)?"
fi
Events_Context=`semanage fcontext -l | grep '/srv/obs/events(/.*)?' | awk '{print $4}' | awk -F: '{print $3}'`
if [[ $Events_Context == "uuidd_var_run_t" ]];then
semanage fcontext -d "/srv/obs/events(/.*)?"
fi
%preun -n obs-common %preun -n obs-common
%systemd_preun obsstoragesetup.service %systemd_preun obsstoragesetup.service
@ -241,8 +247,14 @@ semanage fcontext -d "/srv/obs/events(/.*)?"
%systemd_post obsnotifyforward.service %systemd_post obsnotifyforward.service
%systemd_post obsredis.service %systemd_post obsredis.service
%systemd_post obsworker.service %systemd_post obsworker.service
semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?" Obs_Context=`ls -l -Z /srv | grep obs | awk '{print $5}' | awk -F: '{print $3}'`
semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?" if [[ $Obs_Context != "var_lib_t" ]];then
semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?"
fi
Events_Context=`ls -l -Z /srv/obs | grep events | awk '{print $5}' | awk -F: '{print $3}'`
if [[ $Events_Context != "uuidd_var_run_t" ]];then
semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?"
fi
restorecon -Rv /srv/obs/ restorecon -Rv /srv/obs/
cd /usr/lib64/obs-api/ruby/3.2.0/bin cd /usr/lib64/obs-api/ruby/3.2.0/bin
ls | awk '{print $1}' | for line in `xargs`;do chmod 755 $line;done ls | awk '{print $1}' | for line in `xargs`;do chmod 755 $line;done
@ -498,6 +510,9 @@ usermod -a -G docker obsservicerun
%{_sbindir}/obsstoragesetup %{_sbindir}/obsstoragesetup
%changelog %changelog
* Fri Dec 06 2024 Ge Wang <wang__ge@126.com> - 2.10.15-12
- Fix error info when removed after upgrade
* Thu Jun 20 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 2.10.15-11 * Thu Jun 20 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 2.10.15-11
- rename mod_xforward to apache2-mod_xforward - rename mod_xforward to apache2-mod_xforward