Skip to content

Commit ad08cfd

Browse files
author
gau1991
committed
Merge branch 'master' into stable
2 parents 50b2726 + c3ff7f1 commit ad08cfd

27 files changed

+1492
-159
lines changed

‎.travis.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ script:
6464
- sudo ee site create site12.in --wpfc --wpsubdomain
6565
- sudo ee site create site12.net --wpfc --wpsubdomain
6666

67+
- sudo ee site create site.hhvm.pagespeed2.com --wpsc --hhvm --pagespeed
68+
- sudo ee site create site.hhvm.pagespeed3.com --w3tc --hhvm --pagespeed
69+
- sudo ee site create site.hhvm.pagespeed4.com --wpfc --hhvm --pagespeed
70+
- sudo ee site create site.hhvm.pagespeed5.com --wpsubdir --hhvm --pagespeed
71+
- sudo ee site create site.hhvm.pagespeed6.com --wpsubdir --wpsc --hhvm --pagespeed
72+
- sudo ee site create site.hhvm.pagespeed7.com --wpsubdir --w3tc --hhvm --pagespeed
73+
- sudo ee site create site.hhvm.pagespeed8.com --wpsubdir --wpfc --hhvm --pagespeed
74+
- sudo ee site create site.hhvm.pagespeed9.com --wpsubdomain --hhvm --pagespeed
75+
- sudo ee site create site.hhvm.pagespeed10.org --wpsubdomain --wpsc --hhvm --pagespeed
76+
- sudo ee site create site.hhvm.pagespeed11.in --w3tc --wpsubdomain --hhvm --pagespeed
77+
- sudo ee site create site.hhvm.pagespeed12.in --wpfc --wpsubdomain --hhvm --pagespeed
78+
6779
- sudo ee debug --all
6880
- sudo ee debug --all=off
6981
- sudo ee debug site12.net
@@ -87,6 +99,10 @@ script:
8799
- sudo ee site update site9.com --wpsubdomain --wpfc
88100
- sudo ee site update site9.com --wpsubdomain --w3tc
89101
- sudo ee site update site9.com --wpsubdomain --wpsc
102+
- sudo ee site update site.hhvm.pagespeed12.in --pagespeed=off --hhvm=off
103+
- sudo ee site update site9.com --hhvm --pagespeed
104+
- sudo ee site info site.hhvm.pagespeed12.in
105+
- sudo ee site info site9.com
90106

91107
- sudo ee site create www.site-1.com --wp
92108
- sudo ee site create www.subsite.site-1.com --wpfc
@@ -96,6 +112,7 @@ script:
96112
- sudo ee site delete site12.in --all --no-prompt
97113
- sudo ee site delete site12.net --no-prompt
98114
- sudo ee site delete site12.org --no-prompt
115+
- sudo ee site delete site9.com --no-prompt
99116

100117
- sudo ee stack install --mail
101118
- sudo ls /var/www/

‎CHANGELOG.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v 3.1.0 - April 16, 2015
2+
- Added HHVM support #199
3+
- Added Pagespeed support #473
4+
- EasyEngine log command now suppots more subcommand #448
5+
- Before stack purge or remove, EasyEngine now asks confirmation #485
6+
- Minor fixes and improvements
7+
18
v 3.0.10 - April 10, 2015
29
- Fixed regression issue introduced in 3.0.9
310

‎config/bash_completion.d/ee_auto.rc‎

Lines changed: 96 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _ee_complete()
2222
# HANDLE EVERYTHING AFTER THE SECOND LEVEL NAMESPACE
2323
"clean")
2424
COMPREPLY=( $(compgen \
25-
-W "--memcache --opcache --fastcgi --all" \
25+
-W "--memcache --opcache --fastcgi --pagespeed --all" \
2626
-- $cur) )
2727
;;
2828

@@ -59,7 +59,7 @@ _ee_complete()
5959

6060
"log")
6161
COMPREPLY=( $(compgen \
62-
-W "$(command find /etc/nginx/sites-enabled/ -type l -printf "%P " 2> /dev/null) --mysql --php --nginx --all" \
62+
-W "show reset gzip mail" \
6363
-- $cur) )
6464
;;
6565

@@ -74,7 +74,7 @@ _ee_complete()
7474
# HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
7575
"install" | "purge" | "remove" )
7676
COMPREPLY=( $(compgen \
77-
-W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot --all --mailscanner" \
77+
-W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot --all --mailscanner --hhvm" \
7878
-- $cur) )
7979
;;
8080
"start" | "stop" | "reload" | "restart" | "status")
@@ -94,8 +94,32 @@ _ee_complete()
9494
;;
9595

9696
"edit" | "enable" | "info" | "log" | "show" | "cd" | "update" | "delete")
97+
if [ ${COMP_WORDS[1]} == "log" ]; then
98+
COMPREPLY=( $(compgen \
99+
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --access" \
100+
-- $cur) )
101+
else
102+
COMPREPLY=( $(compgen \
103+
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null)" \
104+
-- $cur) )
105+
fi
106+
;;
107+
108+
"gzip")
97109
COMPREPLY=( $(compgen \
98-
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null)" \
110+
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --access" \
111+
-- $cur) )
112+
;;
113+
114+
"mail")
115+
COMPREPLY=( $(compgen \
116+
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --access --to=" \
117+
-- $cur) )
118+
;;
119+
120+
"reset")
121+
COMPREPLY=( $(compgen \
122+
-W "$(find /etc/nginx/sites-available/ -type f -printf "%P " 2> /dev/null) --nginx --php --fpm --mysql --wp --access --slow-log-db" \
99123
-- $cur) )
100124
;;
101125

@@ -117,13 +141,13 @@ _ee_complete()
117141
-- $cur) )
118142
fi
119143

120-
if [ ${COMP_WORDS[1]} == "log" ] && ([ "$prev" != "--access" ] || [ "$prev" != "--nginx" ] || [ "$prev" != "--php" ] || [ "$prev" != "--fpm" ] || [ "$prev" != "--mysql" ] || [ "$prev" != "-i" ] || ["$prev" != "--interactive" ] || ["$prev" != "--stop" ]); then
121-
retlist="--all --wp --rewrite -i --all=off --wp=off --rewrite=off"
122-
ret="${retlist[@]/$prev}"
123-
COMPREPLY=( $(compgen \
124-
-W "$(echo $ret)" \
125-
-- $cur) )
126-
fi
144+
#if [ ${COMP_WORDS[1]} == "log" ] && ([ "$prev" != "--access" ] || [ "$prev" != "--nginx" ] || [ "$prev" != "--php" ] || [ "$prev" != "--fpm" ] || [ "$prev" != "--mysql" ] || [ "$prev" != "-i" ] || ["$prev" != "--interactive" ] || ["$prev" != "--stop" ]); then
145+
# retlist="--all --wp --rewrite -i --all=off --wp=off --rewrite=off"
146+
# ret="${retlist[@]/$prev}"
147+
# COMPREPLY=( $(compgen \
148+
# -W "$(echo $ret)" \
149+
# -- $cur) )
150+
#fi
127151

128152

129153
elif [ $COMP_CWORD -eq 4 ]; then
@@ -132,20 +156,48 @@ _ee_complete()
132156

133157
"create")
134158
COMPREPLY=( $(compgen \
135-
-W "--html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc" \
159+
-W "--html --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed" \
136160
-- $cur) )
137161
;;
138162

139163
"update")
140164
COMPREPLY=( $(compgen \
141-
-W "--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc" \
165+
-W "--password --php --mysql --wp --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off" \
142166
-- $cur) )
143167
;;
144168
"delete")
145169
COMPREPLY=( $(compgen \
146170
-W "--db --files --all --no-prompt" \
147171
-- $cur) )
148172
;;
173+
"show")
174+
COMPREPLY=( $(compgen \
175+
-W "--wp --nginx --php --fpm --mysql --access" \
176+
-- $cur) )
177+
;;
178+
179+
"gzip")
180+
COMPREPLY=( $(compgen \
181+
-W "--wp --nginx --php --fpm --mysql --access" \
182+
-- $cur) )
183+
;;
184+
185+
"mail")
186+
COMPREPLY=( $(compgen \
187+
-W "--wp --nginx --php --fpm --mysql --access --to=" \
188+
-- $cur) )
189+
;;
190+
191+
"reset")
192+
COMPREPLY=( $(compgen \
193+
-W "--wp --nginx --php --fpm --mysql --wp --access --slow-log-db" \
194+
-- $cur) )
195+
;;
196+
edit)
197+
COMPREPLY=( $(compgen \
198+
-W "--pagespeed" \
199+
-- $cur) )
200+
;;
149201
*)
150202
;;
151203
esac
@@ -176,6 +228,18 @@ _ee_complete()
176228
if [[ $prev == '--mysql' ]]; then
177229
retlist="--start --nginx --php --fpm --mysql -i --interactive --stop --import-slow-log"
178230
fi
231+
elif [[ ${COMP_WORDS[1]} == "log" ]]; then
232+
if [ ${COMP_WORDS[2]} == "show" ]; then
233+
retlist="--access --nginx --php --mysql --fpm --wp"
234+
235+
elif [ ${COMP_WORDS[2]} == "reset" ]; then
236+
retlist="--access --nginx --php --mysql --fpm --wp --slow-log-db"
237+
238+
239+
elif [ ${COMP_WORDS[2]} == "mail" ]; then
240+
retlist="--access --nginx --php --mysql --fpm --wp --to="
241+
242+
fi
179243
fi
180244
ret="${retlist[@]/$prev}"
181245
COMPREPLY=( $(compgen \
@@ -218,6 +282,25 @@ _ee_complete()
218282
-W "$(echo $ret)" \
219283
-- $cur) )
220284
;;
285+
"--access" | "--fpm" | "--wp" | "--slow-log-db")
286+
if [[ ${COMP_WORDS[1]} == "log" ]]; then
287+
if [ ${COMP_WORDS[2]} == "show" ]; then
288+
retlist="--access --nginx --php --mysql --fpm --wp"
289+
290+
elif [ ${COMP_WORDS[2]} == "reset" ]; then
291+
retlist="--access --nginx --php --mysql --fpm --wp --slow-log-db"
292+
293+
294+
elif [ ${COMP_WORDS[2]} == "mail" ]; then
295+
retlist="--access --nginx --php --mysql --fpm --wp --to="
296+
297+
fi
298+
fi
299+
ret="${retlist[@]/$prev}"
300+
COMPREPLY=( $(compgen \
301+
-W "$(echo $ret)" \
302+
-- $cur) )
303+
;;
221304
*)
222305
;;
223306
esac

‎ee/cli/main.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
# External templates (generally, do not ship with application code)
3131
defaults['ee']['template_dir'] = '/var/lib/ee/templates'
3232

33+
3334
class EEArgHandler(ArgParseArgumentHandler):
3435
class Meta:
3536
label = 'ee_args_handler'
@@ -80,6 +81,7 @@ class Meta:
8081

8182
def main():
8283
try:
84+
global sys
8385
# Default our exit status to 0 (non-error)
8486
code = 0
8587

@@ -91,6 +93,9 @@ def main():
9193
# Setup the application
9294
app.setup()
9395

96+
# Dump all arguments into ee log
97+
app.log.debug(sys.argv)
98+
9499
# Run the application
95100
app.run()
96101
except exc.EEError as e:

‎ee/cli/plugins/clean.py‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,31 @@ class Meta:
2929
(['--memcache'],
3030
dict(help='Clean MemCache', action='store_true')),
3131
(['--opcache'],
32-
dict(help='Clean OpCache', action='store_true'))
32+
dict(help='Clean OpCache', action='store_true')),
33+
(['--pagespeed'],
34+
dict(help='Clean Pagespeed Cache', action='store_true')),
3335
]
3436
usage = "ee clean [options]"
3537

3638
@expose(hide=True)
3739
def default(self):
3840
if (not (self.app.pargs.all or self.app.pargs.fastcgi or
39-
self.app.pargs.memcache or self.app.pargs.opcache)):
41+
self.app.pargs.memcache or self.app.pargs.opcache or
42+
self.app.pargs.pagespeed)):
4043
self.clean_fastcgi()
4144
if self.app.pargs.all:
4245
self.clean_memcache()
4346
self.clean_fastcgi()
4447
self.clean_opcache()
48+
self.clean_pagespeed()
4549
if self.app.pargs.fastcgi:
4650
self.clean_fastcgi()
4751
if self.app.pargs.memcache:
4852
self.clean_memcache()
4953
if self.app.pargs.opcache:
5054
self.clean_opcache()
55+
if self.app.pargs.pagespeed:
56+
self.clean_pagespeed()
5157

5258
@expose(hide=True)
5359
def clean_memcache(self):
@@ -82,6 +88,15 @@ def clean_opcache(self):
8288
Log.debug(self, "{0}".format(e))
8389
Log.error(self, "Unable to clean OpCache")
8490

91+
@expose(hide=True)
92+
def clean_pagespeed(self):
93+
"""This function clears Pagespeed cache"""
94+
if(os.path.isdir("/var/ngx_pagespeed_cache")):
95+
Log.info(self, "Cleaning PageSpeed cache")
96+
EEShellExec.cmd_exec(self, "rm -rf /var/ngx_pagespeed_cache/*")
97+
else:
98+
Log.error(self, "Unable to clean Pagespeed cache")
99+
85100

86101
def load(app):
87102
# register the plugin class.. this only happens if the plugin is enabled

‎ee/cli/plugins/debug.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ def debug_php(self):
164164
"conf.d/upstream.conf "
165165
"| grep 9001")):
166166
Log.info(self, "Enabling PHP debug")
167-
data = dict(php="9001", debug="9001")
168-
Log.info(self, 'Writting the Nginx debug configration to file '
169-
'/etc/nginx/conf.d/upstream.conf ')
167+
data = dict(php="9001", debug="9001", hhvm="9001")
168+
Log.debug(self, 'Writting the Nginx debug configration to file'
169+
' /etc/nginx/conf.d/upstream.conf ')
170170
ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
171171
encoding='utf-8', mode='w')
172172
self.app.render((data), 'upstream.mustache', out=ee_nginx)
@@ -190,7 +190,7 @@ def debug_php(self):
190190
"/etc/nginx/conf.d/upstream.conf "
191191
"| grep 9001"):
192192
Log.info(self, "Disabling PHP debug")
193-
data = dict(php="9000", debug="9001")
193+
data = dict(php="9000", debug="9001", hhvm="8000")
194194
Log.debug(self, 'Writting the Nginx debug configration to file'
195195
' /etc/nginx/conf.d/upstream.conf ')
196196
ee_nginx = open('/etc/nginx/conf.d/upstream.conf',

0 commit comments

Comments
 (0)