Browse Source

Fix for disable pagespeed

hotfix/v3.3.14
Prabuddha Chakraborty 10 years ago
parent
commit
92a0b587d9
  1. 6
      ee/cli/plugins/site.py
  2. 4
      ee/cli/plugins/site_functions.py

6
ee/cli/plugins/site.py

@ -855,6 +855,12 @@ class EESiteUpdateController(CementBaseController):
old_hhvm = check_site.is_hhvm old_hhvm = check_site.is_hhvm
old_pagespeed = check_site.is_pagespeed old_pagespeed = check_site.is_pagespeed
if pagespeed is old_pagespeed:
if pagespeed is False:
data['old_pagespeed'] = False
elif pagespeed is True:
data['old_pagespeed'] = True
if (pargs.password and not (pargs.html or if (pargs.password and not (pargs.html or
pargs.php or pargs.mysql or pargs.wp or pargs.php or pargs.mysql or pargs.wp or
pargs.w3tc or pargs.wpfc or pargs.wpsc pargs.w3tc or pargs.wpfc or pargs.wpsc

4
ee/cli/plugins/site_functions.py

@ -618,7 +618,7 @@ def sitebackup(self, data):
.format(data['site_name']), backup_path) .format(data['site_name']), backup_path)
if data['currsitetype'] in ['html', 'php', 'proxy', 'mysql']: if data['currsitetype'] in ['html', 'php', 'proxy', 'mysql']:
if data['pagespeed'] is True and not data['wp']: if data['pagespeed'] is True or data['old_pagespeed'] is True and not data['wp']:
Log.info(self, "Backing up Webroot \t\t", end='') Log.info(self, "Backing up Webroot \t\t", end='')
EEFileUtils.copyfiles(self, ee_site_webroot + '/htdocs', backup_path + '/htdocs') EEFileUtils.copyfiles(self, ee_site_webroot + '/htdocs', backup_path + '/htdocs')
Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")
@ -658,7 +658,7 @@ def sitebackup(self, data):
Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")
# move wp-config.php/ee-config.php to backup # move wp-config.php/ee-config.php to backup
if data['currsitetype'] in ['mysql', 'proxy']: if data['currsitetype'] in ['mysql', 'proxy']:
if data['pagespeed'] is True and not data['wp']: if data['pagespeed'] is True or data['old_pagespeed'] is True and not data['wp']:
EEFileUtils.copyfile(self, configfiles[0], backup_path) EEFileUtils.copyfile(self, configfiles[0], backup_path)
else: else:
EEFileUtils.mvfile(self, configfiles[0], backup_path) EEFileUtils.mvfile(self, configfiles[0], backup_path)

Loading…
Cancel
Save