From aefeddd9d4c0c43f7b05aa3e046a1f53ad284852 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:06:41 +0100
Subject: [PATCH] testing

---
 install/domain-monitor-install.sh | 57 ++++++++++++++++---------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/install/domain-monitor-install.sh b/install/domain-monitor-install.sh
index 0b8d676f1..413f2dee9 100644
--- a/install/domain-monitor-install.sh
+++ b/install/domain-monitor-install.sh
@@ -15,36 +15,37 @@ update_os
 
 msg_info "Installing Dependencies"
 $STD apt install -y --no-install-recommends \
-      libicu-dev \
-      libzip-dev \
-      libpng-dev \
-      libjpeg62-turbo-dev \
-      libfreetype6-dev \
-      libxml2-dev \
-      libcurl4-openssl-dev \
-      libonig-dev \
-      pkg-config
+  libicu-dev \
+  libzip-dev \
+  libpng-dev \
+  libjpeg62-turbo-dev \
+  libfreetype6-dev \
+  libxml2-dev \
+  libcurl4-openssl-dev \
+  libonig-dev \
+  pkg-config
 msg_ok "Installed Dependencies"
 
 PHP_VERSION="8.4" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql" setup_php
 setup_composer
 setup_mariadb
+DB_NAME="domain_monitor" DB_USER="domainmonitor" setup_mariadb_db
 fetch_and_deploy_gh_release "domain-monitor" "Hosteroid/domain-monitor" "prebuild" "latest" "/opt/domain-monitor" "domain-monitor-v*.zip"
 
-msg_info "Configuring Database"
-DB_NAME=domain_monitor
-DB_USER=domainmonitor
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE DATABASE $DB_NAME CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
-$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
-{
-  echo "Domain Monitor Credentials"
-  echo "Database User: $DB_USER"
-  echo "Database Password: $DB_PASS"
-  echo "Database Name: $DB_NAME"
-} >>~/domain-monitor.creds
-msg_ok "Configured Database"
+# msg_info "Configuring Database"
+# DB_NAME=domain_monitor
+# DB_USER=domainmonitor
+# DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
+# $STD mariadb -u root -e "CREATE DATABASE $DB_NAME CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
+# $STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
+# $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
+# {
+#   echo "Domain Monitor Credentials"
+#   echo "Database User: $DB_USER"
+#   echo "Database Password: $DB_PASS"
+#   echo "Database Name: $DB_NAME"
+# } >>~/domain-monitor.creds
+# msg_ok "Configured Database"
 
 msg_info "Setting up Domain Monitor"
 ENC_KEY=$(openssl rand -base64 48 | tr -dc 'A-Za-z0-9' | head -c 32)
@@ -52,11 +53,11 @@ cd /opt/domain-monitor
 $STD composer install
 cp env.example.txt .env
 sed -i -e "s|^APP_ENV=.*|APP_ENV=production|" \
-       -e "s|^APP_ENCRYPTION_KEY=.*|APP_ENCRYPTION_KEY=$ENC_KEY|" \
-       -e "s|^SESSION_COOKIE_HTTPONLY=.*|SESSION_COOKIE_HTTPONLY=0|" \
-       -e "s|^DB_USERNAME=.*|DB_USERNAME=$DB_USER|" \
-       -e "s|^DB_PASSWORD=.*|DB_PASSWORD=$DB_PASS|" \
-       -e "s|^DB_DATABASE=.*|DB_DATABASE=$DB_NAME|" .env
+  -e "s|^APP_ENCRYPTION_KEY=.*|APP_ENCRYPTION_KEY=$ENC_KEY|" \
+  -e "s|^SESSION_COOKIE_HTTPONLY=.*|SESSION_COOKIE_HTTPONLY=0|" \
+  -e "s|^DB_USERNAME=.*|DB_USERNAME=$DB_USER|" \
+  -e "s|^DB_PASSWORD=.*|DB_PASSWORD=$DB_PASS|" \
+  -e "s|^DB_DATABASE=.*|DB_DATABASE=$DB_NAME|" .env
 
 cat <<EOF >/etc/apache2/sites-enabled/000-default.conf
 <VirtualHost *:80>