From 5946b477d616c3fdf1688e290e0db077f1e0fce2 Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Wed, 15 Jun 2022 11:23:27 +0800 Subject: [PATCH] Fix obs-api install warning --- obs-server.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/obs-server.spec b/obs-server.spec index 1e33509..8519ea6 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 1 +Release: 2 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -277,8 +277,9 @@ rmdir /srv/obs 2> /dev/null || : %systemd_postun_with_restart obsstoragesetup.service %pre -n obs-api -/usr/sbin/groupadd www -/usr/sbin/useradd wwwrun +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 @@ -307,9 +308,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 @@ -516,6 +517,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Wed Jun 15 2022 wangkai - 2.10.15-2 +- Fix obs-api install warning + * Wed May 25 2022 wangkai - 2.10.15-1 - Upgrade to version 2.10.15