Skip to content

Commit 0e1e2dc

Browse files
iam404iam404
committed
Merge branch 'hotfix/v3.7.1'
2 parents 4b759da + d6a76ee commit 0e1e2dc

File tree

10 files changed

+24
-219
lines changed

10 files changed

+24
-219
lines changed

‎CHANGELOG.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v3.7.1 - Jul 1, 2016
2+
- Fix PHP7 support for debian jessie
3+
- Fix PHP7 debug log
4+
15
v3.7.0 - Jun 22, 2016
26
- PHP7 support for debian jessie
37
- Fixed Issue #729, #724

‎ee/cli/plugins/clean.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,6 @@ def clean_opcache(self):
101101
" or install them with `ee stack install --admin`")
102102
Log.error(self, "Unable to clean opcache", False)
103103

104-
# @expose(hide=True)
105-
# def clean_pagespeed(self):
106-
# """This function clears Pagespeed cache"""
107-
# if(os.path.isdir("/var/ngx_pagespeed_cache")):
108-
# Log.info(self, "Cleaning PageSpeed cache")
109-
# EEShellExec.cmd_exec(self, "rm -rf /var/ngx_pagespeed_cache/*")
110-
# else:
111-
# Log.debug(self, "/var/ngx_pagespeed_cache does not exist,"
112-
# " so cache not cleared")
113-
# Log.error(self, "Unable to clean pagespeed cache", False)
114-
115-
116104
def load(app):
117105
# register the plugin class.. this only happens if the plugin is enabled
118106
handler.register(EECleanController)

‎ee/cli/plugins/debug.py‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -305,19 +305,13 @@ def debug_php7(self):
305305
# Change upstream.conf
306306
nc = NginxConfig()
307307
nc.loadf('/etc/nginx/conf.d/upstream.conf')
308-
nc.set([('upstream','php',), 'server'], '127.0.0.1:9170')
308+
nc.set([('upstream','php7',), 'server'], '127.0.0.1:9170')
309309
if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"):
310310
nc.set([('upstream','hhvm',), 'server'], '127.0.0.1:9170')
311311
nc.savef('/etc/nginx/conf.d/upstream.conf')
312312

313313
# Enable xdebug
314-
if (EEVariables.ee_platform_codename != 'jessie'):
315-
EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
316-
"xdebug.ini",
317-
";zend_extension",
318-
"zend_extension")
319-
else:
320-
EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
314+
EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
321315
"xdebug.ini",
322316
";zend_extension",
323317
"zend_extension")
@@ -342,27 +336,21 @@ def debug_php7(self):
342336

343337
# PHP global debug stop
344338
elif (self.app.pargs.php7 == 'off' and not self.app.pargs.site_name):
345-
if EEShellExec.cmd_exec(self, " sed -n \"/upstream php {/,/}/p\" "
339+
if EEShellExec.cmd_exec(self, " sed -n \"/upstream php7 {/,/}/p\" "
346340
"/etc/nginx/conf.d/upstream.conf "
347341
"| grep 9170"):
348342
Log.info(self, "Disabling PHP 7.0 debug")
349343

350344
# Change upstream.conf
351345
nc = NginxConfig()
352346
nc.loadf('/etc/nginx/conf.d/upstream.conf')
353-
nc.set([('upstream','php',), 'server'], '127.0.0.1:9070')
347+
nc.set([('upstream','php7',), 'server'], '127.0.0.1:9070')
354348
if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"):
355349
nc.set([('upstream','hhvm',), 'server'], '127.0.0.1:8000')
356350
nc.savef('/etc/nginx/conf.d/upstream.conf')
357351

358352
# Disable xdebug
359-
if (EEVariables.ee_platform_codename != 'jessie'):
360-
EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
361-
"xdebug.ini",
362-
"zend_extension",
363-
";zend_extension")
364-
else:
365-
EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
353+
EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
366354
"xdebug.ini",
367355
"zend_extension",
368356
";zend_extension")
@@ -793,6 +781,8 @@ def default(self):
793781
EEService.restart_service(self, 'php7.0-fpm')
794782
else:
795783
EEService.restart_service(self, 'php5-fpm')
784+
if EEVariables.ee_platform_codename == 'jessie':
785+
EEService.restart_service(self, 'php7.0-fpm')
796786

797787
if len(self.msg) > 0:
798788
if not self.app.pargs.interactive:

‎ee/cli/plugins/site.py‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,6 @@ def default(self):
594594
data['basic'] = True
595595
self.app.pargs.wpredis = False
596596

597-
# self.app.args.print_help()
598-
# if not data:
599-
# self.app.close(1)
600-
601597
# Check rerequired packages are installed or not
602598
ee_auth = site_package_check(self, stype)
603599

@@ -1335,26 +1331,6 @@ def doupdatesite(self, pargs):
13351331
data['hhvm'] = True
13361332
hhvm = True
13371333

1338-
# if pargs.pagespeed=="on":
1339-
# if (not pargs.experimental):
1340-
# Log.info(self, "PageSpeed is experimental feature and it may not"
1341-
# " work with all CSS/JS/Cache of your site.\nYou can "
1342-
# "disable it by passing --pagespeed=off later.\nDo you wish"
1343-
# " to enable PageSpeed now for {0}?".format(ee_domain))
1344-
1345-
# Check prompt
1346-
# check_prompt = input("Type \"y\" to continue [n]:")
1347-
# if check_prompt != "Y" and check_prompt != "y":
1348-
# Log.info(self, "Not using Pagespeed for given site")
1349-
# data['pagespeed'] = False
1350-
# pagespeed = False
1351-
# else:
1352-
# data['pagespeed'] = True
1353-
# pagespeed = True
1354-
# else:
1355-
# data['pagespeed'] = True
1356-
# pagespeed = True
1357-
13581334
if pargs.letsencrypt == "on":
13591335

13601336
if (not pargs.experimental):

‎ee/cli/plugins/site_functions.py‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,43 +1301,6 @@ def doCleanupAction(self, domain='', webroot='', dbname='', dbuser='',
13011301
raise SiteError("dbhost not provided")
13021302
deleteDB(self, dbname, dbuser, dbhost)
13031303

1304-
1305-
#def operateOnPagespeed(self, data):
1306-
1307-
# ee_domain_name = data['site_name']
1308-
# ee_site_webroot = data['webroot']
1309-
1310-
# if data['pagespeed'] is True:
1311-
# if not os.path.isfile("{0}/conf/nginx/pagespeed.conf.disabled"
1312-
# .format(ee_site_webroot)):
1313-
# Log.debug(self, 'Writting the Pagespeed common '
1314-
# 'configuration to file {0}/conf/nginx/pagespeed.conf'
1315-
# 'pagespeed.conf'.format(ee_site_webroot))
1316-
# ee_nginx = open('{0}/conf/nginx/pagespeed.conf'
1317-
# .format(ee_site_webroot), encoding='utf-8',
1318-
# mode='w')
1319-
# self.app.render((data), 'pagespeed-common.mustache',
1320-
# out=ee_nginx)
1321-
# ee_nginx.close()
1322-
# else:
1323-
# EEFileUtils.mvfile(self, "{0}/conf/nginx/pagespeed.conf.disabled"
1324-
# .format(ee_site_webroot),
1325-
# '{0}/conf/nginx/pagespeed.conf'
1326-
# .format(ee_site_webroot))
1327-
1328-
# elif data['pagespeed'] is False:
1329-
# if os.path.isfile("{0}/conf/nginx/pagespeed.conf"
1330-
# .format(ee_site_webroot)):
1331-
# EEFileUtils.mvfile(self, "{0}/conf/nginx/pagespeed.conf"
1332-
# .format(ee_site_webroot),
1333-
# '{0}/conf/nginx/pagespeed.conf.disabled'
1334-
# .format(ee_site_webroot))
1335-
#
1336-
# # Add nginx conf folder into GIT
1337-
# EEGit.add(self, ["{0}/conf/nginx".format(ee_site_webroot)],
1338-
# msg="Adding Pagespeed config of site: {0}"
1339-
# .format(ee_domain_name))
1340-
13411304
def cloneLetsEncrypt(self):
13421305
letsencrypt_repo = "https://github.com/letsencrypt/letsencrypt"
13431306
if not os.path.isdir("/opt"):

0 commit comments

Comments
 (0)