From eb48c4b8820b77e7b5c817239d774a560c8b800f Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 29 Apr 2025 12:11:33 +0200
Subject: [PATCH] Update phpmyadmin.sh

---
 tools/addon/phpmyadmin.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/tools/addon/phpmyadmin.sh b/tools/addon/phpmyadmin.sh
index e4fb31c..51ef37e 100644
--- a/tools/addon/phpmyadmin.sh
+++ b/tools/addon/phpmyadmin.sh
@@ -130,7 +130,7 @@ function configure_phpmyadmin() {
         systemctl restart apache2
         msg_ok "Configured phpMyAdmin with Apache"
     else
-        msg_info "Configuring Nginx for phpMyAdmin"
+        msg_info "Configuring Nginx for phpMyAdmin (Alpine detected)"
 
         mkdir -p /etc/nginx/http.d
         cat <<EOF >/etc/nginx/http.d/phpmyadmin.conf
@@ -153,17 +153,25 @@ server {
 }
 EOF
 
-        if ! pgrep -x "nginx" >/dev/null; then
-            msg_info "Starting Nginx"
-            rc-service nginx start
+        msg_info "Testing Nginx configuration"
+        if nginx -t; then
+            if ! pgrep -x "nginx" > /dev/null; then
+                msg_info "Starting Nginx"
+                rc-service nginx start
+            else
+                msg_info "Reloading Nginx"
+                rc-service nginx reload
+            fi
+            msg_ok "Configured and started Nginx successfully"
         else
-            msg_info "Reloading Nginx"
-            rc-service nginx reload
+            msg_error "Nginx configuration test failed. Please fix before starting nginx."
+            exit 1
         fi
-        msg_ok "Configured phpMyAdmin with Nginx"
     fi
 }
 
+}
+
 function uninstall_phpmyadmin() {
     msg_info "Stopping Webserver"
     if [[ "$OS" == "Debian" ]]; then