distro for static method and password

This commit is contained in:
rperper
2018-10-31 11:53:03 -04:00
parent b15cd8fa96
commit f79c9f5ea1
2 changed files with 7 additions and 7 deletions

View File

@@ -2938,14 +2938,14 @@ milter_default_action = accept
return 0 return 0
@staticmethod @staticmethod
def setupVirtualEnv(): def setupVirtualEnv(distro):
try: try:
## ##
count = 0 count = 0
while (1): while (1):
if self.distro == centos: if distro == centos:
command = "yum install -y libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel" command = "yum install -y libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel"
else: else:
command = 'apt-get -y install libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-openssl-dev' 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.configureOpenDKIM()
checks.modSecPreReqs() checks.modSecPreReqs()
checks.setupVirtualEnv() checks.setupVirtualEnv(distro)
checks.setupPHPAndComposer() checks.setupPHPAndComposer()
if args.postfix != None: if args.postfix != None:

View File

@@ -1268,10 +1268,10 @@ def Main(cwd, mysql, distro):
installer.setup_mariadb_repo() installer.setup_mariadb_repo()
installer.installMySQL(mysql) installer.installMySQL(mysql)
if distro == centos: #if distro == centos:
installer.changeMYSQLRootPassword() installer.changeMYSQLRootPassword()
if distro == centos and mysql == 'Two': #if distro == centos and mysql == 'Two':
installer.changeMYSQLRootPasswordCyberPanel(mysql) installer.changeMYSQLRootPasswordCyberPanel(mysql)
installer.startMariaDB() installer.startMariaDB()
if distro == ubuntu: if distro == ubuntu:
installer.fixMariaDB() installer.fixMariaDB()