From c584786a620c807ce90c00a671b6e89d0660176a Mon Sep 17 00:00:00 2001
From: wk333 <13474090681@163.com>
Date: Wed, 26 Feb 2025 11:05:46 +0800
Subject: [PATCH] Replace mariadb-server with mysql-server

---
 Adapt-setup-appliance.sh-for-openeuler.patch | 36 ++++++++++++++------
 Gemfile.lock                                 |  2 +-
 obs-server.spec                              |  5 ++-
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Adapt-setup-appliance.sh-for-openeuler.patch b/Adapt-setup-appliance.sh-for-openeuler.patch
index 8a097ed..7759bc5 100644
--- a/Adapt-setup-appliance.sh-for-openeuler.patch
+++ b/Adapt-setup-appliance.sh-for-openeuler.patch
@@ -4,19 +4,35 @@ Date: Mon, 22 Aug 2022 18:35:02 +0800
 Subject: [PATCH] Adapt setup appliance.sh for openeuler
 
 ---
- dist/functions.setup-appliance.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ dist/functions.setup-appliance.sh | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
 diff --git a/dist/functions.setup-appliance.sh b/dist/functions.setup-appliance.sh
-index e2b985e..a02f897 100755
+index fb680db..27c2b1d 100755
 --- a/dist/functions.setup-appliance.sh
 +++ b/dist/functions.setup-appliance.sh
-@@ -632,7 +632,7 @@
-         OBS_SIGND=obssignd
+@@ -647,6 +647,21 @@ function prepare_os_settings {
+         OBS_SIGND=signd
          SIGND_BIN="/usr/sbin/signd"
        ;;
--      fedora)
-+      fedora|openEuler)
-         MYSQL_SERVICE=mariadb
-         HTTPD_SERVICE=httpd
-         HTTPD_USER=apache
++      openEuler)
++        MYSQL_SERVICE=mysqld
++        HTTPD_SERVICE=httpd
++        HTTPD_USER=apache
++        HTTPD_GROUP=apache
++        PASSENGER_CONF=/etc/$HTTPD_SERVICE/conf.d/passenger.conf
++        TRUST_ANCHORS_DIR=/etc/pki/ca-trust/source/anchors
++        UPDATE_SSL_TRUST_BIN=update-ca-trust
++        MOD_PASSENGER_CONF=/etc/$HTTPD_SERVICE/conf.d/passenger.conf
++        INST_PACKAGES_CMD="dnf -y install"
++        APACHE_ADDITIONAL_PACKAGES="$HTTPD_SERVICE mod_xforward mod_passenger memcached"
++        CONFIGURE_APACHE=0
++        OBS_SIGND=signd
++        SIGND_BIN="/usr/sbin/signd"
++      ;;
+     esac
+   done
+ }
+-- 
+2.33.0
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ca7b41..02d9c41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -618,4 +618,4 @@ DEPENDENCIES
   yajl-ruby
 
 BUNDLED WITH
-   2.4.10
+   2.4.19
diff --git a/obs-server.spec b/obs-server.spec
index baf5f90..3b775ca 100644
--- a/obs-server.spec
+++ b/obs-server.spec
@@ -6,7 +6,7 @@
 
 Name:           obs-server
 Version:        2.10.15
-Release:        13
+Release:        14
 Summary:        The Open Build Service -- Server Component
 License:        GPL-2.0-only OR GPL-3.0-only
 URL:            http://www.openbuildservice.org
@@ -514,6 +514,9 @@ usermod -a -G docker obsservicerun
 %{_sbindir}/obsstoragesetup
 
 %changelog
+* Wed Feb 26 2025 wangkai <13474090681@163.com> - 2.10.15-14
+- Replace mariadb-server with mysql-server
+
 * Thu Feb 20 2025 wangkai <13474090681@163.com> - 2.10.15-13
 - Replace ruby-ldap with ruby-ldap3 to fix service failed
 
-- 
Gitee