diff --git a/obs-server.spec b/obs-server.spec index 8168cf202ce6a37723b503aa91b6c89094788c7f..6a5bde274b4dbf7a7081595113272faf19e28e4a 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 11 +Release: 12 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -216,8 +216,14 @@ exit 0 %systemd_preun obsnotifyforward.service %systemd_preun obsredis.service %systemd_preun obsworker.service -semanage fcontext -d "/srv/obs(/.*)?" -semanage fcontext -d "/srv/obs/events(/.*)?" +Obs_Context=`semanage fcontext -l | grep '/srv/obs(/.*)?' | awk '{print $4}' | awk -F: '{print $3}'` +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 %systemd_preun obsstoragesetup.service @@ -241,12 +247,18 @@ semanage fcontext -d "/srv/obs/events(/.*)?" %systemd_post obsnotifyforward.service %systemd_post obsredis.service %systemd_post obsworker.service -semanage fcontext -a -t var_lib_t "/srv/obs(/.*)?" -semanage fcontext -a -t uuidd_var_run_t "/srv/obs/events(/.*)?" +Obs_Context=`ls -l -Z /srv | grep obs | awk '{print $5}' | awk -F: '{print $3}'` +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/ cd /usr/lib64/obs-api/ruby/3.2.0/bin ls | awk '{print $1}' | for line in `xargs`;do chmod 755 $line;done -cd - >/dev/null +cd - > /dev/null %posttrans @@ -498,6 +510,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/obsstoragesetup %changelog +* Fri Dec 06 2024 Ge Wang - 2.10.15-12 +- Fix error info when removed after upgrade + * Sat Aug 10 2024 liyanan - 2.10.15-11 - Clear insignificance infomation when running post script