From d8056441c066e68f8087819ae5fe713019d8e1e7 Mon Sep 17 00:00:00 2001
From: Saeed Vaziry <mr.saeedvaziry@gmail.com>
Date: Sat, 16 Mar 2024 10:35:18 +0100
Subject: [PATCH] add mariadb 10.4

---
 .../Database/scripts/mariadb/install-10.4.sh        | 12 ++++++++++++
 config/core.php                                     | 13 +++++++++++--
 .../views/servers/partials/create-server.blade.php  | 10 +++++-----
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100755 app/SSH/Services/Database/scripts/mariadb/install-10.4.sh

diff --git a/app/SSH/Services/Database/scripts/mariadb/install-10.4.sh b/app/SSH/Services/Database/scripts/mariadb/install-10.4.sh
new file mode 100755
index 0000000..ec0dc75
--- /dev/null
+++ b/app/SSH/Services/Database/scripts/mariadb/install-10.4.sh
@@ -0,0 +1,12 @@
+wget https://downloads.mariadb.com/MariaDB/mariadb_repo_setup
+
+chmod +x mariadb_repo_setup
+
+sudo DEBIAN_FRONTEND=noninteractive ./mariadb_repo_setup \
+   --mariadb-server-version="mariadb-10.4"
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get update
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get install mariadb-server mariadb-backup -y
+
+sudo service mysql start
diff --git a/config/core.php b/config/core.php
index 1903bf0..87fdaa0 100755
--- a/config/core.php
+++ b/config/core.php
@@ -62,7 +62,8 @@
         'none',
         'mysql57',
         'mysql80',
-        'mariadb',
+        'mariadb103',
+        'mariadb104',
         'postgresql12',
         'postgresql13',
         'postgresql14',
@@ -70,9 +71,11 @@
         'postgresql16',
     ],
     'databases_name' => [
+        'none' => 'none',
         'mysql57' => 'mysql',
         'mysql80' => 'mysql',
-        'mariadb' => 'mariadb',
+        'mariadb103' => 'mariadb',
+        'mariadb104' => 'mariadb',
         'postgresql12' => 'postgresql',
         'postgresql13' => 'postgresql',
         'postgresql14' => 'postgresql',
@@ -80,9 +83,12 @@
         'postgresql16' => 'postgresql',
     ],
     'databases_version' => [
+        'none' => '',
         'mysql57' => '5.7',
         'mysql80' => '8.0',
         'mariadb' => '10.3',
+        'mariadb103' => '10.3',
+        'mariadb104' => '10.4',
         'postgresql12' => '12',
         'postgresql13' => '13',
         'postgresql14' => '14',
@@ -188,12 +194,15 @@
         'mariadb' => [
             'ubuntu_18' => [
                 '10.3' => 'mariadb',
+                '10.4' => 'mariadb',
             ],
             'ubuntu_20' => [
                 '10.3' => 'mariadb',
+                '10.4' => 'mariadb',
             ],
             'ubuntu_22' => [
                 '10.3' => 'mariadb',
+                '10.4' => 'mariadb',
             ],
         ],
         'postgresql' => [
diff --git a/resources/views/servers/partials/create-server.blade.php b/resources/views/servers/partials/create-server.blade.php
index d3a762f..e3095b7 100644
--- a/resources/views/servers/partials/create-server.blade.php
+++ b/resources/views/servers/partials/create-server.blade.php
@@ -207,7 +207,7 @@ class="mt-1 block w-full"
             </div>
 
             <div class="grid grid-cols-1 gap-3 lg:grid-cols-3">
-                <div x-show="['regular'].includes(type)">
+                <div x-show="[ServerType::REGULAR].includes(type)">
                     <x-input-label for="webserver" value="Webserver" />
                     <x-select-input id="webserver" name="webserver" class="mt-1 w-full">
                         @foreach (config("core.webservers") as $ws)
@@ -220,12 +220,12 @@ class="mt-1 block w-full"
                         <x-input-error class="mt-2" :messages="$message" />
                     @enderror
                 </div>
-                <div x-show="['regular', 'database'].includes(type)">
+                <div x-show="[ServerType::REGULAR, ServerType::DATABASE].includes(type)">
                     <x-input-label for="database" value="Database" />
                     <x-select-input id="database" name="database" class="mt-1 w-full">
                         @foreach (config("core.databases") as $db)
-                            <option value="{{ $db }}" @if($db == old('database', Database::MYSQL80)) selected @endif>
-                                {{ $db }}
+                            <option value="{{ $db }}" @if($db == old('database', Database::NONE)) selected @endif>
+                                {{ config("core.databases_name")[$db] }} {{ config("core.databases_version")[$db] }}
                             </option>
                         @endforeach
                     </x-select-input>
@@ -233,7 +233,7 @@ class="mt-1 block w-full"
                         <x-input-error class="mt-2" :messages="$message" />
                     @enderror
                 </div>
-                <div x-show="['regular'].includes(type)">
+                <div x-show="[ServerType::REGULAR].includes(type)">
                     <x-input-label for="php" value="PHP" />
                     <x-select-input id="php" name="php" class="mt-1 w-full">
                         @foreach (config("core.php_versions") as $p)