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

!99 修复obs-api安装是多余提示信息

Browse Source 
From: @wk333 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-06-16 12:06:16 +00:00 committed by Gitee
commit 454844ee95
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
obs-server.spec
View File

@ -6,7 +6,7 @@
Name: obs-server Name: obs-server
Version: 2.10.15 Version: 2.10.15
Release: 1 Release: 2
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
@ -277,8 +277,9 @@ rmdir /srv/obs 2> /dev/null || :
%systemd_postun_with_restart obsstoragesetup.service %systemd_postun_with_restart obsstoragesetup.service
%pre -n obs-api %pre -n obs-api
/usr/sbin/groupadd www getent group www >/dev/null || /usr/sbin/groupadd -r www
/usr/sbin/useradd wwwrun
getent passwd wwwrun >/dev/null || /usr/sbin/useradd -d / -g www -s /sbin/nologin -r wwwrun
getent passwd obsapidelayed >/dev/null || \ 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 /usr/sbin/useradd -r -s /bin/bash -c "User for build service api delayed jobs" -d /srv/www/obs/api -g apache obsapidelayed
@ -307,9 +308,9 @@ for i in production.rb ; do
done done
if [ ! -s /srv/www/obs/api/config/secret.key ]; then 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 RAILS_ENV=production bin/rails secret > /srv/www/obs/api/config/secret.key
popd popd >& /dev/null
fi fi
chmod 0640 /srv/www/obs/api/config/secret.key chmod 0640 /srv/www/obs/api/config/secret.key
chown root.apache /srv/www/obs/api/config/secret.key chown root.apache /srv/www/obs/api/config/secret.key
@ -516,6 +517,9 @@ usermod -a -G docker obsservicerun
%{_sbindir}/rcobsstoragesetup %{_sbindir}/rcobsstoragesetup
%changelog %changelog
* Wed Jun 15 2022 wangkai <wangkai385@h-partners.com> - 2.10.15-2
- Fix obs-api install warning
* Wed May 25 2022 wangkai <wangkai385@h-partners.com> - 2.10.15-1 * Wed May 25 2022 wangkai <wangkai385@h-partners.com> - 2.10.15-1
- Upgrade to version 2.10.15 - Upgrade to version 2.10.15