Merge branch 'feature/minorfixes' into develop

Author: iam404

.gitignore

@@ -1,6 +1,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+.idea/
 
 # C extensions
 *.so

.travis.yml

@@ -77,6 +77,13 @@ script:
   - yes | sudo ee site create site.hhvm.pagespeed11.in --w3tc --wpsubdomain --hhvm --pagespeed
   - yes | sudo ee site create site.hhvm.pagespeed12.in --wpfc --wpsubdomain --hhvm --pagespeed
 
+  - sudo ee site create site.localtest.me --php --mysql --html
+  - sudo ee site create site1.localtest.me --php --mysql
+  - sudo ee site create site2.localtest.me --mysql --html
+  - sudo ee site create site3.localtest.me --php --html
+  - sudo ee site create site4.localtest.me --wp --wpsubdomain
+  - sudo ee site create site5.localtest.me --wp --wpsubdir --wpfc
+
   - sudo ee debug --all
   - sudo ee debug --all=off
   - sudo ee debug site12.net

CHANGELOG.txt

@@ -1,3 +1,23 @@
+v 3.3.5 - Aug 26, 2015
+- Introduced new support of --force/-f in delete command of site
+  - Removes database entry or nginx configuration of site from system
+  - ee site delete example.com --force/-f
+  - ee site delete example.com --force/-f --db/--files
+- Moved ~/.my.cnf to /etc/mysql/conf.d/my.cnf
+  - Fixed MySQL credential issue
+- Fixed Bug in cache clean --all command
+- Improved 404 handling for static HTML sites #561
+- Improved cleanup action while site create command fail
+- Updated wpfc config #543
+- Improved ee sync command https://github.com/rtCamp/easyengine/issues/575#issuecomment-126293815
+- Bug Fix #486
+- Bug Fix #555
+- Updated man page
+- Fixed bug in ee update site to --wpredis
+- Fixed Autocompletion Issue #519
+- Fixed minor bug in update --password
+- Minor fix and improvements
+
 v 3.3.4 - Aug 12, 2015
 - Bug Fix for https://github.com/rtCamp/easyengine/issues/598#issue-98354466
 

config/bash_completion.d/ee_auto.rc

@@ -11,7 +11,7 @@ _ee_complete()
     # SETUP THE BASE LEVEL (everything after "ee")
     if [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $(compgen \
-                      -W "stack site debug clean secure import-slow-log log update sync info" \
+                      -W "stack site debug clean secure import-slow-log log update sync info --version --help --quiet" \
                       -- $cur) )
 
 
@@ -22,7 +22,7 @@ _ee_complete()
             # HANDLE EVERYTHING AFTER THE SECOND LEVEL NAMESPACE
             "clean")
                 COMPREPLY=( $(compgen \
-                              -W "--memcache --opcache --fastcgi --pagespeed --all" \
+                              -W "--memcache --opcache --fastcgi --pagespeed --redis --all" \
                               -- $cur) )
                 ;;
 
@@ -176,7 +176,7 @@ _ee_complete()
                 ;;
             "delete")
                 COMPREPLY=( $(compgen \
-                                    -W "--db --files --all --no-prompt" \
+                                    -W "--db --files --all --no-prompt --force -f" \
                                  -- $cur) )
                 ;;
             "show")
@@ -214,10 +214,29 @@ _ee_complete()
     fi
 
     case "$prev" in
-        "--wp" | "--wpsubdir" | "--wpsubdomain")
+        "--wp")
             if [ ${COMP_WORDS[1]} != "debug" ]; then
                 if [ ${COMP_WORDS[2]} == "create" ]; then
-                    retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --user --email --pass --wpredis"
+                    retlist="--wp --wpsc --w3tc --wpfc --pagespeed --hhvm --user --email --pass --wpredis"
+                elif [ ${COMP_WORDS[2]} == "update" ]; then
+                    retlist="--wp --w3tc --wpfc --wpsc --pagespeed --hhvm --pagespeed=off --hhvm=off --wpredis"
+                else
+                    retlist=""
+                fi
+            else
+                retlist="--wp --wp=off --rewrite --rewrite=off -i --interactive"
+            fi
+
+            ret="${retlist[@]/$prev}"
+                COMPREPLY=( $(compgen \
+                              -W "$(echo $ret)" \
+                              -- $cur) )
+            ;;
+
+        "--wpsubdir" | "--wpsubdomain")
+            if [ ${COMP_WORDS[1]} != "debug" ]; then
+                if [ ${COMP_WORDS[2]} == "create" ]; then
+                    retlist="--wpsc --w3tc --wpfc --pagespeed --hhvm --user --email --pass --wpredis"
                 elif [ ${COMP_WORDS[2]} == "update" ]; then
                     retlist="--w3tc --wpfc --wpsc --pagespeed --hhvm --pagespeed=off --hhvm=off --wpredis"
                 else
@@ -233,10 +252,21 @@ _ee_complete()
                               -- $cur) )
             ;;
 
-        "--pagespeed" | "--hhvm" | "--wpredis" )
+        "--pagespeed" | "--hhvm" | "--wpredis" | "--w3tc" | "--wpfc" | "--wpsc" | "--wpsubdir" | "--wpsubdomain" | "--user" | "--pass" | "--email" | "--wp")
             if [ ${COMP_WORDS[2]} == "create" ]; then
-                retlist="--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --experimenal  --wpredis"
-            elif [ ${COMP_WORDS[2]} == "update" ]; then
+                retlist="--user --pass --email --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --experimenal  --wpredis"
+            else
+                retlist=""
+            fi
+
+            ret="${retlist[@]/$prev}"
+                COMPREPLY=( $(compgen \
+                              -W "$(echo $ret)" \
+                              -- $cur) )
+            ;;
+
+        "--pagespeed" | "--hhvm" | "--wpredis" | "--w3tc" | "--wpfc")
+            if [ ${COMP_WORDS[2]} == "update" ]; then
                 retlist="--password --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --experimenal --wpredis"
             else
                 retlist=""
@@ -276,8 +306,8 @@ _ee_complete()
                         -- $cur) )
             ;;
 
-        "--db" | "--files" )
-            retlist="--db --files --all"
+        "--db" | "--files" | "--force")
+            retlist="--db --files --all --force"
             ret="${retlist[@]/$prev}"
             COMPREPLY=( $(compgen \
                           -W "$(echo $ret)" \
@@ -286,9 +316,9 @@ _ee_complete()
 
         "--all")
           if [ ${COMP_WORDS[1]} == "clean" ]; then
-                  retlist="--memcache --opcache --fastcgi"
+                  retlist="--memcache --opcache --fastcgi --redis"
           elif [ ${COMP_WORDS[2]} == "delete" ]; then
-              retlist="--db --files"
+              retlist="--db --files --force"
           elif [ ${COMP_WORDS[2]} == "update" ]; then
             retlist="--password --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --wpredis"
           else
@@ -300,8 +330,8 @@ _ee_complete()
                             -- $cur) )
           ;;
 
-        "--memcache" | "--opcache" | "--fastcgi" | "--all")
-            retlist="--memcache --opcache --fastcgi --all"
+        "--memcache" | "--opcache" | "--fastcgi" | "--all" | "--redis" | "--pagespeed")
+            retlist="--memcache --opcache --fastcgi --pagespeed --redis --all"
             ret="${retlist[@]/$prev}"
             COMPREPLY=( $(compgen \
                           -W "$(echo $ret)" \

docs/ee.8

@@ -1,21 +1,21 @@
-.TH ee 8 "EasyEngine (ee) version: 3.0" "Feb 2,2014" "EasyEngine"
+.TH ee 8 "EasyEngine (ee) version: 3.3.5" "Aug 11,2015" "EasyEngine"
 .SH NAME
 .B EasyEngine (ee)
 \- Manage Nginx Based Websites.
 .SH SYNOPSIS
-ee [ --version | --help | info | stack | site | debug | update ]
+ee [ --version | --help | info | stack | site | debug | update | clean | import_slow_log | log | secure | sync]
 .TP
-ee stack [ install | remove | purge ] [ --web | --mail | --all | --nginx | --php | --mysql       | --postfix | --adminer | --phpmyadmin | --wpcli | --utils ]
+ee stack [ install | remove | purge | migrate | upgrade] [ --web | --mail | --all | --nginx | --php | --mysql | --admin | --postfix | --mailscanner | --adminer | --redis | --hhvm | --phpmyadmin | --phpredisadmin | --wpcli | --utils ]
 .TP
-ee stack [ status | start | stop | reload | restart ]
+ee stack [ status | start | stop | reload | restart ] [--all | --nginx | --php | --mysql | --devcot | --web | --postfix | --memcache | --redis]
 .TP
-ee site [ list | info | show | enable | disable | edit ] [ example.com ]
+ee site [ list | info | show | enable | disable | edit | cd | show ] [ example.com ]
 .TP
-ee site create example.com [ --html | --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--basic | --wpsc | --w3tc | --wpfc]]
+ee site create example.com [ --html | --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --w3tc | --wpfc | --wpredis | --hhvm | --pagespeed ]]
 .TP
-ee site update example.com [ --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--basic | --wpsc | --w3tc | --wpfc]]
+ee site update example.com [ --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --w3tc | --wpfc | --wpredis | --hhvm | --pagespeed ] [--password]]
 .TP
-ee site delete example.com [--db | --files | --all | --no-prompt ]
+ee site delete example.com [--db | --files | --all | --no-prompt | --force/-f ]
 .TP
 ee debug [ -i | --all=on/off |--nginx=on/off | --rewrite=on/off | --php=on/off | --fpm=on/off | --mysql=on/off ]
 .TP
@@ -46,43 +46,43 @@ Display easyengine (ee) help.
 .TP
 .B stack
 .TP
-.B install [ --all | --web | --mail | --nginx | --php | --mysql | --postfix | --adminer | --phpmyadmin | --wpcli | --utils ]
+.B install [ --all | --web | --mail | --nginx | --php | --mysql | --redis | --postfix | --adminer | --phpmyadmin | --phpredismyadmin | --wpcli | --utils ]
 .br
 Install Nginx PHP5 MySQL Postfix stack Packages if not used with
 .br
 any options.Installs specific package if used with option.
 .TP
-.B remove [ --all | --web | --mail | --nginx | --php | --mysql | --postfix | --adminer | --phpmyadmin | --wpcli | --utils ]
+.B remove [ --all | --web | --mail | --nginx | --php | --mysql | --redis | --postfix | --adminer | --phpmyadmin | --phpredismyadmin | --wpcli | --utils ]
 .br
 Remove Nginx PHP5 MySQL Postfix stack Packages if not used with
 .br
 any options. Remove specific package if used with option.
 .TP
-.B purge [ --all | --web | --mail | --nginx | --php | --mysql | --postfix | --adminer | --phpmyadmin | --wpcli | --utils ]
+.B purge [ --all | --web | --mail | --nginx | --php | --mysql | --redis | --postfix | --adminer | --phpmyadmin | --phpredismyadmin | --wpcli | --utils ]
 .br
 Purge Nginx PHP5 MySQL Postfix stack Packages if not used with any
 .br
 options.Purge specific package if used with option.
 .TP
 .B status
 .br
-Display status of NGINX, PHP5-FPM, MySQL, Postfix services.
+Display status of NGINX, PHP5-FPM, MySQL, Postfix, Redis-Server services.
 .TP
 .B start
 .br
-Start services NGINX, PHP5-FPM, MySQL, Postfix.
+Start services NGINX, PHP5-FPM, MySQL, Postfix, Redis-Server.
 .TP
 .B stop
 .br
-Stop services NGINX, PHP5-FPM, MySQL, Postfix.
+Stop services NGINX, PHP5-FPM, MySQL, Postfix, Redis-Server.
 .TP
 .B reload
 .br
-Reload services NGINX, PHP5-FPM, MySQL, Postfix.
+Reload services NGINX, PHP5-FPM, MySQL, Postfix, Redis-Server.
 .TP
 .B restart
 .br
-Restart services NGINX, PHP5-FPM, MySQL, Postfix.
+Restart services NGINX, PHP5-FPM, MySQL, Postfix, Redis-Server.
 .TP
 .B site
 .br
@@ -129,19 +129,19 @@ Disable site by Destroying softlink with site file in
 .br
 Edit NGINX configuration of site.
 .TP
-.B create [ example.com ] [ --html | --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--basic | --wpsc | --w3tc | --wpfc]]
+.B create [ example.com ] [ --html | --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--wpsc | --w3tc | --wpfc | --wpredis | --hhvm | --pagespeed ]]
 .br
 Create new site according to given options. If no options provided
 .br
 create static site with html only.
 .TP
-.B update [ example.com ] [ --html | --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [--basic | --wpsc | --w3tc | --wpfc]]
+.B update [ example.com ] [ --html | --php | --mysql] [[--wp | --wpsubdir | --wpsubdomain ] [ --wpsc | --w3tc | --wpfc | --wpredis | --hhvm | --pagespeed ] [--password]]
 .br
 Update site configuration according to specified options.
 .TP
-.B delete [ example.com ] [--no-prompt ] [ --db | --files ]
+.B delete [ example.com ] [--no-prompt ] [--force/-f] [ --db | --files | --all ]
 .br
-Delete site i.e webroot, database, ad configuration permenantly.
+Delete site i.e webroot, database, ad configuration permanently.
 .TP
 .B debug [ -i | --nginx=on/off | --php=on/off | --mysql=on/off | --rewrite=on/off | --fpm=on/off ]
 .br
@@ -159,13 +159,13 @@ services.Else it will debug only service provided with argument.This will Stop D
 .br
 if used with --all=off argument.
 .TP
-.B secure [ --auth | --port ]
+.B secure [ --auth | --port | --ip ]
 .br
 Update security settings.
 .TP
-.B clean [ --fastcgi | --opcache | --memcache | --all ]
+.B clean [ --fastcgi | --opcache | --memcache | --redis | --pagespeed | --all ]
 .br
-Clean NGINX fastCGI cache, Opcache, Memcache.
+Clean NGINX fastCGI cache, Opcache, Memcache, Redis cache, Pagespeed cache.
 .br
 Clean NGINX fastCGI cache if no option specified.
 .SH ARGUMENTS
@@ -244,6 +244,12 @@ Delete website webroot.
 .B --no-prompt
 .br
 Does not prompt for confirmation when delete command used.
+.br
+.TP
+.B --force/-f
+.br
+Delete website webroot and database forcefully.Remove nginx configuration for site.
+.br
 .TP
 .B --auth
 .br
@@ -258,10 +264,6 @@ used with ee secure command. Change EasyEngine admin port 22222.
 used with ee secure command. Update whitelist IP address
 .SH WORDPRESS CACHING OPTIONS
 .TP
-.B --basic
-.br
-Create WordPress website without cache.
-.TP
 .B --w3tc
 .br
 Install and activate Nginx-helper and W3 Total Cache plugin.
@@ -275,6 +277,14 @@ Install and activate Nginx-helper and WP Super Cache plugin.
 Install and activate Nginx-helper and W3 Total Cache plugin with
 .br
 Nginx FastCGI cache.
+.TP
+.B --wpredis
+.br
+Install, activate, configure Nginx-helper and Redis Object Cache Plugin, Configure NGINX for Redis Page Caching.
+.TP
+.B --hhvm
+.br
+Install, activate Nginx-helper and configure NGINX for HHVM. 
 .SH FILES
 .br
 /etc/easyengine/ee.conf
@@ -300,6 +310,13 @@ Report bugs at <http://github.com/rtCamp/easyengine/issues/>
 .B Shital
 .I \<[email protected]\>
 .br
+.B Prabuddha
+.I \<[email protected]\>
+.br
+.B Rajdeep Sharma
+.I \<[email protected]\>
+.br
+
 .SH "SEE ALSO"
 .br
 EE:

ee/cli/plugins/clean.py

@@ -20,7 +20,7 @@ class Meta:
         label = 'clean'
         stacked_on = 'base'
         stacked_type = 'nested'
-        description = ('Clean NGINX FastCGI cache, Opcacache, Memcache')
+        description = ('Clean NGINX FastCGI cache, Opcacache, Memcache, Pagespeed Cache, Redis Cache')
         arguments = [
             (['--all'],
                 dict(help='Clean all cache', action='store_true')),
@@ -80,7 +80,7 @@ def clean_memcache(self):
                 Log.info(self, "Memcache not installed")
         except Exception as e:
             Log.debug(self, "{0}".format(e))
-            Log.error(self, "Unable to restart Memcached")
+            Log.error(self, "Unable to restart Memcached", False)
 
     @expose(hide=True)
     def clean_fastcgi(self):
@@ -89,7 +89,7 @@ def clean_fastcgi(self):
             Log.info(self, "Cleaning NGINX FastCGI cache")
             EEShellExec.cmd_exec(self, "rm -rf /var/run/nginx-cache/*")
         else:
-            Log.error(self, "Unable to clean FastCGI cache")
+            Log.error(self, "Unable to clean FastCGI cache", False)
 
     @expose(hide=True)
     def clean_opcache(self):
@@ -105,7 +105,7 @@ def clean_opcache(self):
                           " please check you have admin tools installed")
                 Log.debug(self, "please check you have admin tools installed,"
                          " or install them with `ee stack install --admin`")
-                Log.error(self, "Unable to clean opcache")
+                Log.error(self, "Unable to clean opcache", False)
 
     @expose(hide=True)
     def clean_pagespeed(self):
@@ -116,7 +116,7 @@ def clean_pagespeed(self):
         else:
             Log.debug(self, "/var/ngx_pagespeed_cache does not exist," 
                             " so cache not cleared")
-            Log.error(self, "Unable to clean pagespeed cache")
+            Log.error(self, "Unable to clean pagespeed cache", False)
 
 
 def load(app):