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

!62 fix obsapisetup script problems, modify production.sphinx.conf owner

Browse Source 
From: @ultra_planet
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-12-01 08:17:32 +00:00 committed by Gitee
commit 1784caddcd
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Adapt-setup-appliance.sh-for-openeuler.patch Normal file
View File

@ -0,0 +1,34 @@
From 804c99034ac187f00875a5324ee2a13251d3fc98 Mon Sep 17 00:00:00 2001
From: lingsheng <lingsheng@huawei.com>
Date: Thu, 23 Sep 2021 09:53:06 +0800
Subject: [PATCH] Adapt setup-appliance.sh for openeuler
---
dist/setup-appliance.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dist/setup-appliance.sh b/dist/setup-appliance.sh
index 37b1cf3..51e4ef6 100755
--- a/dist/setup-appliance.sh
+++ b/dist/setup-appliance.sh
@@ -247,7 +247,7 @@ function prepare_database_setup {
echo " - changing ownership for new datadir"
chown mysql:mysql -R /srv/obs/MySQL
echo " - restarting mysql"
- systemctl restart mysql
+ systemctl restart mariadb
echo " - setting new password for user root in mysql"
mysqladmin -u root password "opensuse"
if [[ $? > 0 ]];then
@@ -376,7 +376,7 @@ function relink_server_cert {
###############################################################################
function fix_permissions {
cd $apidir
- chown -R wwwrun.www $apidir/log
+ chown -R apache.apache $apidir/log
}
###############################################################################
--
2.23.0

7
obs-server.spec
View File

@ -5,7 +5,7 @@
Name: obs-server
Version: 2.10.1
Release: lp151.23.11
Release: lp151.23.12
Summary: The Open Build Service -- Server Component
License: GPL-2.0-only or GPL-3.0-only
URL: http://www.openbuildservice.org
@ -20,6 +20,7 @@ Patch5: 0005-obsscheduler-stop.patch
Patch6: change-bundled-rubygem-bundler-version.patch
Patch7: fix-obs_productconvert-inputfile-path.patch
Patch8: obs_project_update-should-tell-the-usage-but-not-hung-still.patch
Patch9: Adapt-setup-appliance.sh-for-openeuler.patch
BuildArch: noarch
@ -292,6 +293,7 @@ chown root.apache /srv/www/obs/api/config/secret.key
sed -i -e 's,[ ]*adapter: mysql$, adapter: mysql2,' /srv/www/obs/api/config/database.yml
touch /srv/www/obs/api/log/production.log
chown apache:apache /srv/www/obs/api/log/production.log
chown apache:apache /srv/www/obs/api/config/production.sphinx.conf
%systemd_postun_with_restart memcached
%systemd_post %{obs_api_support_scripts}
@ -490,6 +492,9 @@ usermod -a -G docker obsservicerun
%{_sbindir}/rcobsstoragesetup
%changelog
* Wed Dec 01 2021 lingsheng <lingsheng@huawei.com> - 2.10.1-lp151.23.12
- fix obsapisetup script problems, modify production.sphinx.conf owner
* Thu Oct 14 2021 herengui <herengui@uniontech.com> - 2.10.1-lp151.23.11
- sync two patch from openEuler-20.03-LTS-SP2