From 8bf988cff956cc79949796098c9a5ca455dabc7b Mon Sep 17 00:00:00 2001
From: Sagnik Sasmal <16162562+SagnikSRHUSE@users.noreply.github.com>
Date: Fri, 11 Sep 2020 15:19:25 +0530
Subject: [PATCH] Fix MySQL binding and detection improvement

Fixed MySQL binding on debian style and upstream configs 10.4 onwards and improved config file detection
---
 install.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index a29b48b..1cf5c05 100644
--- a/install.sh
+++ b/install.sh
@@ -531,28 +531,27 @@ install_pterodactyl() {
     mysql -u root -e "$SQL"
 
     output "Binding MariaDB/MySQL to 0.0.0.0."
-        if [ -f /etc/mysql/mariadb.conf.d/50-server.cnf ] ; then
-        	sed -i -- 's/bind-address/# bind-address/g' /etc/mysql/mariadb.conf.d/50-server.cnf
-		sed -i '/\[mysqld\]/a bind-address = 0.0.0.0' /etc/mysql/mariadb.conf.d/50-server.cnf
+        if [ -f /etc/mysql/mariadb.conf.d/50-server.cnf && grep -Fq "bind-address" /etc/mysql/mariadb.conf.d/50-server.cnf ] ; then
+ 		sed -i -- '/bind-address/s/127.0.0.1/0.0.0.0/g' /etc/mysql/mariadb.conf.d/50-server.cnf
 		output 'Restarting MySQL process...'
 		service mysql restart
-	elif [ -f /etc/mysql/my.cnf ] ; then
+	elif [ -f /etc/mysql/my.cnf && grep -Fq "bind-address" /etc/mysql/my.cnf ] ; then
         	sed -i -- 's/bind-address/# bind-address/g' /etc/mysql/my.cnf
 		sed -i '/\[mysqld\]/a bind-address = 0.0.0.0' /etc/mysql/my.cnf
 		output 'Restarting MySQL process...'
 		service mysql restart
-	elif [ -f /etc/my.cnf ] ; then
+	elif [ -f /etc/my.cnf && grep -Fq "bind-address" /etc/my.cnf ] ; then
         	sed -i -- 's/bind-address/# bind-address/g' /etc/my.cnf
 		sed -i '/\[mysqld\]/a bind-address = 0.0.0.0' /etc/my.cnf
 		output 'Restarting MySQL process...'
 		service mysql restart
-    	elif [ -f /etc/mysql/my.conf.d/mysqld.cnf ] ; then
+    	elif [ -f /etc/mysql/my.conf.d/mysqld.cnf && grep -Fq "bind-address" /etc/mysql/my.conf.d/mysqld.cnf ] ; then
         	sed -i -- 's/bind-address/# bind-address/g' /etc/mysql/my.conf.d/mysqld.cnf
 		sed -i '/\[mysqld\]/a bind-address = 0.0.0.0' /etc/mysql/my.conf.d/mysqld.cnf
 		output 'Restarting MySQL process...'
 		service mysql restart
 	else 
-		output 'File my.cnf was not found! Please contact support.'
+		output 'A MySQL configuration file could not be detected! Please contact support.'
 	fi
     
     output "Downloading Pterodactyl..."