Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
cab96007b0
!134 Fix obs-api install warning
From: @lyn1001 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
2023-11-20 06:28:31 +00:00
lyn1001
3667823360 fix install errror 2023-11-20 10:46:48 +08:00
openeuler-ci-bot
8110056246
!133 Add post script to adapt selinux policy
From: @wang--ge 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2023-11-08 10:19:29 +00:00
wang--ge
2395b57654 Add post script to adatp selinux policy 2023-11-08 17:41:21 +08:00
openeuler-ci-bot
2c8f2aa752
!97 [sync] PR-95: 修复obs-api安装是多余提示信息
From: @openeuler-sync-bot 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-06-16 12:05:58 +00:00
caodongxia
e079b882b4 Fix obs-api installwarning
(cherry picked from commit d84803e10c31b6937f3ac89f627c7a71440054ad)
2022-05-27 09:02:35 +08:00
openeuler-ci-bot
d7dc2010c6
!87 Update xmlhash to 1.3.8 for fix CVE-2022-21949
From: @wk333 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-05-17 01:04:51 +00:00
wk333
650f276668 Update xmlhash to 1.3.8 for fix CVE-2022-21949 2022-05-16 11:36:50 +08:00
openeuler-ci-bot
3914839b00
!80 release + 1
From: @houyingchao 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
2022-03-18 06:15:39 +00:00
houyingchao
2af156cde7 release + 1 2022-03-18 10:19:41 +08:00
2 changed files with 26 additions and 4 deletions

View File

@ -468,7 +468,7 @@ GEM
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
xmlhash (1.3.7)
xmlhash (1.3.8)
pkg-config
xmlrpc (0.3.0)
xpath (3.2.0)

View File

@ -5,7 +5,7 @@
Name: obs-server
Version: 2.10.11
Release: 1
Release: 6
Summary: The Open Build Service -- Server Component
License: GPL-2.0-only or GPL-3.0-only
URL: http://www.openbuildservice.org
@ -34,6 +34,7 @@ Requires: createrepo_c, dpkg, yum, perl-Compress-Zlib, perl-File-Sync >= 0
Requires: perl-Net-SSLeay, perl-Socket-MsgHdr, perl-XML-Parser, perl-XML-Simple, perl-YAML-LibYAML
Requires: cpio, curl, perl-Compress-Zlib, perl-TimeDate, screen, psmisc, bash, binutils, bsdtar
Requires: util-linux >= 2.16, osc
Requires: policycoreutils-python-utils
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@ -200,6 +201,8 @@ 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(/.*)?"
%preun -n obs-common
%systemd_preun obsstoragesetup.service
@ -223,6 +226,9 @@ exit 0
%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(/.*)?"
restorecon -Rv /srv/obs/
%posttrans
[ -d /srv/obs ] || install -d -o obsrun -g obsrun /srv/obs
@ -257,6 +263,10 @@ rmdir /srv/obs 2> /dev/null || :
%systemd_postun_with_restart obsstoragesetup.service
%pre -n obs-api
getent group www >/dev/null || /usr/sbin/groupadd -r www
getent passwd wwwrun >/dev/null || /usr/sbin/useradd -d / -g www -s /sbin/nologin -r wwwrun
getent passwd obsapidelayed >/dev/null || \
/usr/sbin/useradd -r -s /bin/bash -c "User for build service api delayed jobs" -d /srv/www/obs/api -g apache obsapidelayed
@ -285,9 +295,9 @@ for i in production.rb ; do
done
if [ ! -s /srv/www/obs/api/config/secret.key ]; then
pushd /srv/www/obs/api
pushd /srv/www/obs/api >& /dev/null
RAILS_ENV=production bin/rails secret > /srv/www/obs/api/config/secret.key
popd
popd >& /dev/null
fi
chmod 0640 /srv/www/obs/api/config/secret.key
chown root.apache /srv/www/obs/api/config/secret.key
@ -494,6 +504,18 @@ usermod -a -G docker obsservicerun
%{_sbindir}/rcobsstoragesetup
%changelog
* Mon Nov 20 2023 liyanan <liyanan61@h-partners.com> - 2.10.11-6
- Fix obs-api install warning
* Wed Nov 08 2023 Ge Wang <wang__ge@126.com> - 2.10.11-5
- Add post script to adatp selinux policy
* Thu May 26 2022 caodongxia <caodongxia@h-partners.com> - 2.10.11-4
- Fix obs-api install warning
* Mon May 16 2022 wangkai <wangkai385@h-partners.com> - 2.10.11-3
- Update xmlhash to 1.3.8 for fix CVE-2022-21949
* Thu Mar 17 2022 houyingchao <houyingchao@huawei.com> - 2.10.11-2
- Fix install failed