From f79c9f5ea1a0cdb8857a226cc05bde065fec23d8 Mon Sep 17 00:00:00 2001
From: rperper <rperper@litespeedtech.com>
Date: Wed, 31 Oct 2018 11:53:03 -0400
Subject: [PATCH] distro for static method and password

---
 install/install.py           | 6 +++---
 install/installCyberPanel.py | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/install/install.py b/install/install.py
index 98f1950c0..317d09055 100755
--- a/install/install.py
+++ b/install/install.py
@@ -2938,14 +2938,14 @@ milter_default_action = accept
             return 0
 
     @staticmethod
-    def setupVirtualEnv():
+    def setupVirtualEnv(distro):
         try:
 
             ##
 
             count = 0
             while (1):
-                if self.distro == centos:
+                if distro == centos:
                     command = "yum install -y libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel"
                 else:
                     command = 'apt-get -y install libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-openssl-dev'
@@ -3256,7 +3256,7 @@ def main():
     checks.configureOpenDKIM()
 
     checks.modSecPreReqs()
-    checks.setupVirtualEnv()
+    checks.setupVirtualEnv(distro)
     checks.setupPHPAndComposer()
 
     if args.postfix != None:
diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py
index e92e0197c..2ab2e1d7b 100644
--- a/install/installCyberPanel.py
+++ b/install/installCyberPanel.py
@@ -1268,10 +1268,10 @@ def Main(cwd, mysql, distro):
 
     installer.setup_mariadb_repo()
     installer.installMySQL(mysql)
-    if distro == centos:
-        installer.changeMYSQLRootPassword()
-    if distro == centos and mysql == 'Two':
-        installer.changeMYSQLRootPasswordCyberPanel(mysql)
+    #if distro == centos:
+    installer.changeMYSQLRootPassword()
+    #if distro == centos and mysql == 'Two':
+    installer.changeMYSQLRootPasswordCyberPanel(mysql)
     installer.startMariaDB()
     if distro == ubuntu:
         installer.fixMariaDB()