diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index baa6fa33..9c3dfaec 100644 --- a/ee/cli/plugins/site.py +++ b/ee/cli/plugins/site.py @@ -4,7 +4,7 @@ from cement.core import handler, hook from ee.core.variables import EEVariables from ee.core.domainvalidate import validate_domain from ee.core.fileutils import EEFileUtils -from ee.cli.plugins.site_functions import setup_domain, setup_database +from ee.cli.plugins.site_functions import * import sys import os @@ -131,8 +131,7 @@ class EESiteCreateController(CementBaseController): data = dict(site_name=ee_domain_name, static=True, basic=False, wp=False, w3tc=False, wpfc=False, wpsc=False, multisite=False, - wpsubdir=False, webroot=ee_site_webroot, - ee_db_name='', ee_db_user='', ee_db_pass='') + wpsubdir=False, webroot=ee_site_webroot) if (self.app.pargs.php and not (self.app.pargs.html or self.app.pargs.mysql or self.app.pargs.wp or self.app.pargs.w3tc @@ -141,8 +140,7 @@ class EESiteCreateController(CementBaseController): data = dict(site_name=ee_domain_name, static=False, basic=True, wp=False, w3tc=False, wpfc=False, wpsc=False, multisite=False, - wpsubdir=False, webroot=ee_site_webroot, - ee_db_name='', ee_db_user='', ee_db_pass='') + wpsubdir=False, webroot=ee_site_webroot) if (self.app.pargs.mysql and not (self.app.pargs.html or self.app.pargs.php or self.app.pargs.wp or self.app.pargs.w3tc @@ -252,7 +250,10 @@ class EESiteCreateController(CementBaseController): ee_db_name='', ee_db_user='', ee_db_pass='') setup_domain(self, data) - setup_database(self, data) + if 'ee_db_name' in data.keys(): + data = setup_database(self, data) + if data['wp']: + setup_wordpress(self, data) class EESiteUpdateController(CementBaseController): diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 9a5573ca..ec9ead53 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -63,7 +63,6 @@ def setup_database(self, data): prompt_dbname = self.app.config.get('mysql', 'db-name') prompt_dbuser = self.app.config.get('mysql', 'db-user') ee_mysql_host = self.app.config.get('mysql', 'grant-host') - print(ee_random) if prompt_dbname == 'True': try: @@ -111,9 +110,13 @@ def setup_database(self, data): EEMysql.execute(self, "grant all privileges on \'{0}\'.* to \'{1}\'@\'{2}\'" .format(ee_db_name, ee_db_username, ee_db_password)) + data['ee_db_name'] = ee_db_name + data['ee_db_user'] = ee_db_username + data['ee_db_pass'] = ee_db_password + return data -def setup_wordpress(data): +def setup_wordpress(self, data): ee_domain_name = data['site_name'] ee_site_webroot = data['webroot'] prompt_wpprefix = self.app.config.get('wordpress', 'prefix') @@ -156,11 +159,22 @@ def setup_wordpress(data): EEFileUtils.searchreplace('{0}/wp-config.php'.format(ee_site_webroot), 'wp_', '')''' - EEShellExec.cmd_exec(self, "wp --allow-root core config" - "--dbname={0} --dbprefix={1}" - .format(ee_db_name, ee_wp_prefix) - "--dbuser={2} --dbprefix={3}" - .format(ee_db_user, ee_db_password)) + EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot)) + if not data['multisite']: + EEShellExec.cmd_exec(self, "wp --allow-root core config" + "--dbname={0} --dbprefix={1} --dbuser={2}" + .format(ee_db_name, ee_wp_prefix, ee_db_user) + + "--dbpass={0}".format(ee_db_password)) + + else: + EEShellExec.cmd_exec(self, "wp --allow-root core config" + "--dbname={0} --dbprefix={1}" + .format(ee_db_name, ee_wp_prefix) + + "--dbuser={0} --dbpass={1} --extra-php<