diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index d8d1dcd6d..ae8214490 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -585,7 +585,7 @@ $parameters = array( statusFile.writelines('Configuring the installation,40') statusFile.close() - command = "wp core config --dbname=" + dbName + " --dbuser=" + dbUser + " --dbpass=" + dbPassword + " --dbhost=%s --dbprefix=wp_ --allow-root --path=" % (ApplicationInstaller.LOCALHOST) + finalPath + command = "wp core config --dbname=" + dbName + " --dbuser=" + dbUser + " --dbpass=" + dbPassword + " --dbhost=%s:%s --dbprefix=wp_ --allow-root --path=" % (ApplicationInstaller.LOCALHOST, ApplicationInstaller.PORT) + finalPath result = ProcessUtilities.outputExecutioner(command, externalApp) if result.find('Success:') == -1: diff --git a/plogical/mysqlUtilities.py b/plogical/mysqlUtilities.py index 71e75a7b0..d76fdd4b2 100755 --- a/plogical/mysqlUtilities.py +++ b/plogical/mysqlUtilities.py @@ -27,6 +27,7 @@ class mysqlUtilities: LOCALHOST = 'localhost' RDS = 0 + REMOTEHOST = '' @staticmethod def getPagination(records, toShow): @@ -67,6 +68,7 @@ class mysqlUtilities: mysqlpassword = jsonData['mysqlpassword'] mysqlport = jsonData['mysqlport'] mysqlhost = jsonData['mysqlhost'] + mysqlUtilities.REMOTEHOST = mysqlhost if mysqlhost.find('rds.amazon') > -1: mysqlUtilities.RDS = 1 @@ -117,8 +119,17 @@ class mysqlUtilities: cursor.execute("CREATE USER '" + dbuser + "'@'%s' IDENTIFIED BY '" % (mysqlUtilities.LOCALHOST) + dbpassword+ "'") if mysqlUtilities.RDS == 0: + cursor.execute( + "CREATE USER '" + dbuser + "'@'%s' IDENTIFIED BY '" % (mysqlUtilities.LOCALHOST) + dbpassword + "'") cursor.execute("GRANT ALL PRIVILEGES ON " + dbname + ".* TO '" + dbuser + "'@'%s'" % (mysqlUtilities.LOCALHOST)) else: + if mysqlUtilities.REMOTEHOST.find('ondigitalocean') > -1: + query = "CREATE USER '%s'@'%s' IDENTIFIED WITH mysql_native_password BY '%s'" % (dbuser, mysqlUtilities.LOCALHOST, dbpassword) + else: + query = "CREATE USER '" + dbuser + "'@'%s' IDENTIFIED BY '" % (mysqlUtilities.LOCALHOST) + dbpassword + "'" + + cursor.execute(query) + cursor.execute( "GRANT INDEX, DROP, UPDATE, ALTER, CREATE, SELECT, INSERT, DELETE ON " + dbname + ".* TO '" + dbuser + "'@'%s'" % (mysqlUtilities.LOCALHOST)) connection.close() diff --git a/websiteFunctions/StagingSetup.py b/websiteFunctions/StagingSetup.py index d97bd8179..7e6346d40 100644 --- a/websiteFunctions/StagingSetup.py +++ b/websiteFunctions/StagingSetup.py @@ -98,7 +98,7 @@ class StagingSetup(multi.Thread): dbNameRestore, dbUser, dbPassword = ApplicationInstaller(None, None).dbCreation(tempStatusPath, website) - command = 'wp core config --dbname=%s --dbuser=%s --dbpass=%s --dbhost=%s --path=%s' % (dbNameRestore, dbUser, dbPassword, ApplicationInstaller.LOCALHOST, path) + command = 'wp core config --dbname=%s --dbuser=%s --dbpass=%s --dbhost=%s:%s --path=%s' % (dbNameRestore, dbUser, dbPassword, ApplicationInstaller.LOCALHOST, ApplicationInstaller.PORT, path) ProcessUtilities.executioner(command, website.externalApp) ## Exporting and importing database