diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 6eb1e76..8455856 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -1608,6 +1608,35 @@ class WOSiteUpdateController(CementBaseController): " `tail /var/log/wo/wordops.log` " "and please try again") return 1 + + elif ((oldcachetype in ['wpsc', 'basic', 'wpfc', 'wprocket', 'wpredis'] and + (data['wpce'])) or (oldsitetype == 'wp' and + data['multisite'] and + data['wpce'])): + try: + plugin_data_object = {"expires": 24, + "new_post": 1, + "new_comment": 0, + "webp": 0, + "clear_on_upgrade": 1, + "compress": 0, + "excl_ids": "", + "excl_regexp": "", + "excl_cookies": "", + "incl_attributes": "", + "minify_html": 1} + plugin_data = json.dumps(plugin_data_object) + setupwp_plugin( + self, 'cache-enabler', + 'cache-enabler', plugin_data, data) + except SiteError as e: + Log.debug(self, str(e)) + Log.info(self, Log.FAIL + "Update cache-enabler " + "settings failed. " + "Check the log for details:" + " `tail /var/log/wo/wordops.log` " + "and please try again") + return 1 else: try: plugin_data_object = {"log_level": "INFO", diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index dbb1db4..1e99a36 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -587,7 +587,20 @@ def setupwordpress(self, data): """Install Cache-Enabler""" if data['wpce']: - installwp_plugin(self, 'cache-enabler', data) + plugin_data_object = {"expires": 24, + "new_post": 1, + "new_comment": 0, + "webp": 0, + "clear_on_upgrade": 1, + "compress": 0, + "excl_ids": "", + "excl_regexp": "", + "excl_cookies": "", + "incl_attributes": "", + "minify_html": 1} + plugin_data = json.dumps(plugin_data_object) + setupwp_plugin(self, 'cache-enabler', 'cache-enabler', + plugin_data, data) wp_creds = dict(wp_user=wo_wp_user, wp_pass=wo_wp_pass, wp_email=wo_wp_email) @@ -656,12 +669,12 @@ def uninstallwp_plugin(self, plugin_name, data): Log.info(self, "Uninstalling plugin {0}, please wait..." .format(plugin_name)) try: - WOShellExec.cmd_exec(self, "php {0} plugin " + WOShellExec.cmd_exec(self, "{0} plugin " .format(WOVariables.wo_wpcli_path) + "--allow-root deactivate " "{0}".format(plugin_name)) - WOShellExec.cmd_exec(self, "php {0} plugin " + WOShellExec.cmd_exec(self, "{0} plugin " .format(WOVariables.wo_wpcli_path) + "--allow-root uninstall " "{0}".format(plugin_name)) @@ -678,7 +691,7 @@ def setupwp_plugin(self, plugin_name, plugin_option, plugin_data, data): if not data['multisite']: try: - WOShellExec.cmd_exec(self, "php {0} " + WOShellExec.cmd_exec(self, "{0} " .format(WOVariables.wo_wpcli_path) + "--allow-root option update " "{0} \'{1}\' --format=json" @@ -688,7 +701,7 @@ def setupwp_plugin(self, plugin_name, plugin_option, plugin_data, data): raise SiteError("plugin setup failed") else: try: - WOShellExec.cmd_exec(self, "php {0} " + WOShellExec.cmd_exec(self, "{0} " .format(WOVariables.wo_wpcli_path) + "--allow-root network meta update 1 " "{0} \'{1}\' --format=json" @@ -1224,16 +1237,16 @@ def site_url_https(self, domain): WOFileUtils.chdir(self, '{0}/htdocs/'.format(wo_site_webroot)) wo_siteurl = \ WOShellExec.cmd_exec_stdout(self, - "php {0} option get siteurl " + "{0} option get siteurl " .format(WOVariables.wo_wpcli_path) + "--allow-root --quiet") test_url = re.split(":", wo_siteurl) if not (test_url[0] == 'https'): try: - WOShellExec.cmd_exec(self, "php {0} option update siteurl " + WOShellExec.cmd_exec(self, "{0} option update siteurl " "\'https://{1}\' --allow-root".format( WOVariables.wo_wpcli_path, domain)) - WOShellExec.cmd_exec(self, "php {0} option update home " + WOShellExec.cmd_exec(self, "{0} option update home " "\'https://{1}\' --allow-root".format( WOVariables.wo_wpcli_path, domain)) except CommandExecutionError as e: diff --git a/wo/cli/templates/wpce.mustache b/wo/cli/templates/wpce.mustache index e345a2b..3df4508 100644 --- a/wo/cli/templates/wpce.mustache +++ b/wo/cli/templates/wpce.mustache @@ -1,4 +1,4 @@ -# WPCE NGINX CONFIGURATION - WO v3.9.7 +# WPCE NGINX CONFIGURATION - WO v3.9.8 # DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE # $cache_uri variable set in /etc/nginx/conf.d/map-wp.conf # Use cached or actual file if they exists, Otherwise pass request to WordPress diff --git a/wo/cli/templates/wprocket.mustache b/wo/cli/templates/wprocket.mustache index 8e01d9d..f2b9d10 100644 --- a/wo/cli/templates/wprocket.mustache +++ b/wo/cli/templates/wprocket.mustache @@ -1,4 +1,4 @@ -# WPROCKET NGINX CONFIGURATION - WO v3.9.7 +# WPROCKET NGINX CONFIGURATION - WO v3.9.8 # DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE # $cache_uri variable set in /etc/nginx/conf.d/map-wp.conf # Use cached or actual file if they exists, Otherwise pass request to WordPress