Skip to content

Commit ddd825b

Browse files
harshadyeolaharshadyeola
committed
Merge branch 'release/v3.3.0'
2 parents 22c8000 + 20beab7 commit ddd825b

File tree

16 files changed

+751
-163
lines changed

16 files changed

+751
-163
lines changed

‎CHANGELOG.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
v 3.3.0 - Jul 13, 2015
2+
- Added support for Redis full page cache
3+
- Added support to update WPCLI
4+
- Added support for custom WPCLI location
5+
- Updated WPCLI to v0.19.2
6+
- Refined ee site update command
7+
- autoconfigure nginx-helper plugin
8+
19
v 3.2.2 - Jun 19, 2015
210
- Fixed bug that was preventing disabling debug
311

‎config/bash_completion.d/ee_auto.rc‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ _ee_complete()
7474
# HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
7575
"install" | "purge" | "remove" )
7676
COMPREPLY=( $(compgen \
77-
-W "--pagespeed --web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
77+
-W "--pagespeed --web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm --redis --phpredisadmin" \
7878
-- $cur) )
7979
;;
8080
"upgrade" )
8181
COMPREPLY=( $(compgen \
82-
-W "--web --mail --nginx --php --mysql --postfix --all --hhvm --php56 --no-prompt" \
82+
-W "--web --mail --nginx --php --mysql --postfix --all --hhvm --php56 --no-prompt --wpcli" \
8383
-- $cur) )
8484
;;
8585
"start" | "stop" | "reload" | "restart" | "status")
8686
COMPREPLY=( $(compgen \
87-
-W "--nginx --php --mysql --postfix --memcache --dovecot" \
87+
-W "--nginx --php --mysql --postfix --memcache --dovecot --redis" \
8888
-- $cur) )
8989
;;
9090
"migrate")
@@ -165,13 +165,13 @@ _ee_complete()
165165

166166
"create")
167167
COMPREPLY=( $(compgen \
168-
-W "--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --proxy= --pagespeed" \
168+
-W "--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --proxy= --pagespeed --wpredis" \
169169
-- $cur) )
170170
;;
171171

172172
"update")
173173
COMPREPLY=( $(compgen \
174-
-W "--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off" \
174+
-W "--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --wpredis" \
175175
-- $cur) )
176176
;;
177177
"delete")
@@ -217,9 +217,9 @@ _ee_complete()
217217
"--wp" | "--wpsubdir" | "--wpsubdomain")
218218
if [ ${COMP_WORDS[1]} != "debug" ]; then
219219
if [ ${COMP_WORDS[2]} == "create" ]; then
220-
retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --user --email --pass"
220+
retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --user --email --pass --wpredis"
221221
elif [ ${COMP_WORDS[2]} == "update" ]; then
222-
retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --pagespeed=off --hhvm=off"
222+
retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --pagespeed=off --hhvm=off --wpredis"
223223
else
224224
retlist=""
225225
fi
@@ -233,11 +233,11 @@ _ee_complete()
233233
-- $cur) )
234234
;;
235235

236-
"--pagespeed" | "--hhvm")
236+
"--pagespeed" | "--hhvm" | "--wpredis" )
237237
if [ ${COMP_WORDS[2]} == "create" ]; then
238-
retlist="--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --experimenal"
238+
retlist="--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --experimenal --wpredis"
239239
elif [ ${COMP_WORDS[2]} == "update" ]; then
240-
retlist="--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --experimenal"
240+
retlist="--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --experimenal --wpredis"
241241
else
242242
retlist=""
243243
fi
@@ -248,11 +248,11 @@ _ee_complete()
248248
-- $cur) )
249249
;;
250250

251-
"--web" | "--admin" | "--mail" | "--nginx" | "--php" | "--mysql" | "--postfix" | "--wpcli" | "--phpmyadmin" | "--adminer" | "--utils" | "--memcache" | "--dovecot")
251+
"--web" | "--admin" | "--mail" | "--nginx" | "--php" | "--mysql" | "--postfix" | "--wpcli" | "--phpmyadmin" | "--adminer" | "--utils" | "--memcache" | "--dovecot" | "--redis | --phpredisadmin")
252252
if [[ ${COMP_WORDS[2]} == "install" || ${COMP_WORDS[2]} == "purge" || ${COMP_WORDS[2]} == "remove" ]]; then
253-
retlist="--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot"
253+
retlist="--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot --redis --phpredisadmin"
254254
elif [[ ${COMP_WORDS[2]} == "start" || ${COMP_WORDS[2]} == "reload" || ${COMP_WORDS[2]} == "restart" || ${COMP_WORDS[2]} == "stop" ]]; then
255-
retlist="--nginx --php --mysql --postfix --memcache --dovecot"
255+
retlist="--nginx --php --mysql --postfix --memcache --dovecot --redis"
256256
elif [[ ${COMP_WORDS[1]} == "debug" ]]; then
257257
retlist="--start --nginx --php --fpm --mysql -i --interactive -stop --import-slow-log --import-slow-log-interval= -"
258258
if [[ $prev == '--mysql' ]]; then
@@ -290,7 +290,7 @@ _ee_complete()
290290
elif [ ${COMP_WORDS[2]} == "delete" ]; then
291291
retlist="--db --files"
292292
elif [ ${COMP_WORDS[2]} == "update" ]; then
293-
retlist="--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off"
293+
retlist="--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --wpredis"
294294
else
295295
retlist=""
296296
fi
@@ -339,7 +339,7 @@ _ee_complete()
339339
case "$mprev" in
340340
"--user" | "--email" | "--pass")
341341
if [ ${COMP_WORDS[2]} == "create" ]; then
342-
retlist="--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed"
342+
retlist="--user --pass --email --html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --wpredis"
343343
fi
344344
ret="${retlist[@]/$prev}"
345345
COMPREPLY=( $(compgen \

‎ee/cli/plugins/clean.py‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,22 @@ class Meta:
3232
dict(help='Clean OpCache', action='store_true')),
3333
(['--pagespeed'],
3434
dict(help='Clean Pagespeed Cache', action='store_true')),
35+
(['--redis'],
36+
dict(help='Clean Redis Cache', action='store_true')),
3537
]
3638
usage = "ee clean [options]"
3739

3840
@expose(hide=True)
3941
def default(self):
4042
if (not (self.app.pargs.all or self.app.pargs.fastcgi or
4143
self.app.pargs.memcache or self.app.pargs.opcache or
42-
self.app.pargs.pagespeed)):
44+
self.app.pargs.pagespeed or self.app.pargs.redis)):
4345
self.clean_fastcgi()
4446
if self.app.pargs.all:
4547
self.clean_memcache()
4648
self.clean_fastcgi()
4749
self.clean_opcache()
50+
self.clean_redis()
4851
self.clean_pagespeed()
4952
if self.app.pargs.fastcgi:
5053
self.clean_fastcgi()
@@ -54,6 +57,17 @@ def default(self):
5457
self.clean_opcache()
5558
if self.app.pargs.pagespeed:
5659
self.clean_pagespeed()
60+
if self.app.pargs.redis:
61+
self.clean_redis()
62+
63+
@expose(hide=True)
64+
def clean_redis(self):
65+
"""This function clears Redis cache"""
66+
if(EEAptGet.is_installed(self, "redis-server")):
67+
Log.info(self, "Cleaning Redis cache")
68+
EEShellExec.cmd_exec(self, "redis-cli flushall")
69+
else:
70+
Log.info(self, "Redis is not installed")
5771

5872
@expose(hide=True)
5973
def clean_memcache(self):
@@ -63,7 +77,7 @@ def clean_memcache(self):
6377
EEService.restart_service(self, "memcached")
6478
Log.info(self, "Cleaning MemCache")
6579
else:
66-
Log.error(self, "Memcache not installed")
80+
Log.info(self, "Memcache not installed")
6781
except Exception as e:
6882
Log.debug(self, "{0}".format(e))
6983
Log.error(self, "Unable to restart Memcached")
@@ -86,7 +100,12 @@ def clean_opcache(self):
86100
"/opcache/opgui.php?page=reset").read()
87101
except Exception as e:
88102
Log.debug(self, "{0}".format(e))
89-
Log.error(self, "Unable to clean OpCache")
103+
Log.debug(self, "Unable hit url, "
104+
" https://127.0.0.1:22222/cache/opcache/opgui.php?page=reset,"
105+
" please check you have admin tools installed")
106+
Log.debug(self, "please check you have admin tools installed,"
107+
" or install them with `ee stack install --admin`")
108+
Log.error(self, "Unable to clean opcache")
90109

91110
@expose(hide=True)
92111
def clean_pagespeed(self):
@@ -95,7 +114,9 @@ def clean_pagespeed(self):
95114
Log.info(self, "Cleaning PageSpeed cache")
96115
EEShellExec.cmd_exec(self, "rm -rf /var/ngx_pagespeed_cache/*")
97116
else:
98-
Log.error(self, "Unable to clean Pagespeed cache")
117+
Log.debug(self, "/var/ngx_pagespeed_cache does not exist,"
118+
" so cache not cleared")
119+
Log.error(self, "Unable to clean pagespeed cache")
99120

100121

101122
def load(app):

‎ee/cli/plugins/debug.py‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from ee.cli.plugins.site_functions import logwatch
1010
from ee.core.variables import EEVariables
1111
from ee.core.fileutils import EEFileUtils
12+
from pynginxconfig import NginxConfig
1213
import os
1314
import configparser
1415
import glob
@@ -173,20 +174,15 @@ def debug_php(self):
173174
"| grep 9001")):
174175

175176
Log.info(self, "Enabling PHP debug")
176-
# Check HHVM is installed if not instlled then dont not enable
177-
# it in upstream config
177+
178+
# Change upstream.conf
179+
nc = NginxConfig()
180+
nc.loadf('/etc/nginx/conf.d/upstream.conf')
181+
nc.set([('upstream','php',), 'server'], '127.0.0.1:9001')
178182
if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"):
179-
hhvmconf=True
180-
else:
181-
hhvmconf=False
182-
data = dict(php="9001", debug="9001", hhvm="9001",
183-
hhvmconf=hhvmconf)
184-
Log.debug(self, 'Writting the Nginx debug configration to file'
185-
' /etc/nginx/conf.d/upstream.conf ')
186-
ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
187-
encoding='utf-8', mode='w')
188-
self.app.render((data), 'upstream.mustache', out=ee_nginx)
189-
ee_nginx.close()
183+
nc.set([('upstream','hhvm',), 'server'], '127.0.0.1:9001')
184+
nc.savef('/etc/nginx/conf.d/upstream.conf')
185+
190186
# Enable xdebug
191187
EEFileUtils.searchreplace(self, "/etc/php5/mods-available/"
192188
"xdebug.ini",
@@ -218,21 +214,14 @@ def debug_php(self):
218214
"| grep 9001"):
219215
Log.info(self, "Disabling PHP debug")
220216

221-
# Check HHVM is installed if not instlled then dont not enable
222-
# it in upstream config
217+
# Change upstream.conf
218+
nc = NginxConfig()
219+
nc.loadf('/etc/nginx/conf.d/upstream.conf')
220+
nc.set([('upstream','php',), 'server'], '127.0.0.1:9000')
223221
if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"):
224-
hhvmconf=True
225-
else:
226-
hhvmconf=False
227-
data = dict(php="9000", debug="9001", hhvm="8000",
228-
hhvmconf=hhvmconf)
229-
230-
Log.debug(self, 'Writting the Nginx debug configration to file'
231-
' /etc/nginx/conf.d/upstream.conf ')
232-
ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
233-
encoding='utf-8', mode='w')
234-
self.app.render((data), 'upstream.mustache', out=ee_nginx)
235-
ee_nginx.close()
222+
nc.set([('upstream','hhvm',), 'server'], '127.0.0.1:8000')
223+
nc.savef('/etc/nginx/conf.d/upstream.conf')
224+
236225
# Disable xdebug
237226
EEFileUtils.searchreplace(self, "/etc/php5/mods-available/"
238227
"xdebug.ini",

0 commit comments

Comments
 (0)