diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 93e8eda8..e2ce928f 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -499,7 +499,13 @@ def uninstallwp_plugin(self, plugin_name, data): Log.debug(self, "Uninstalling plugin {0}, please wait..." .format(plugin_name)) EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot)) + Log.info(self, "Uninstalling plugin {0}, please wait..." + .format(plugin_name)) try: + EEShellExec.cmd_exec(self, "php /usr/bin/wp plugin " + "--allow-root deactivate " + "{0}".format(plugin_name)) + EEShellExec.cmd_exec(self, "php /usr/bin/wp plugin " "--allow-root uninstall " "{0}".format(plugin_name)) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 548e7d5e..08156757 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -535,6 +535,16 @@ class EEStackController(CementBaseController): out=ee_nginx) ee_nginx.close() + if os.path.isfile("/etc/nginx/conf.d/upstream.conf"): + if not EEFileUtils.grep(self, "/etc/nginx/conf.d/" + "upstream.conf", + "redis"): + with open("/etc/nginx/conf.d/upstream.conf", + "a") as redis_file: + redis_file.write("upstream redis {\n" + " server 127.0.0.1:6379;\n" + " keepalive 10;\n}") + if set(EEVariables.ee_php).issubset(set(apt_packages)): # Create log directories if not os.path.exists('/var/log/php5/'):