Merge branch 'hotfix/v3.2.1'

Author: gau1991

CHANGELOG.txt

@@ -1,3 +1,8 @@
+v 3.2.1 - Jun 19, 205
+- Improved experimental HHVM and Pagespeed handling, fixes #564, #562
+- Fixed missing link for Proxy sites #571
+- Added hhvm.server.ip for HHVM config #567
+
 v 3.2.0 - May 28, 2015
 - Now using openSuse builder to build Nginx package for both Ubuntu and Debian
 - Minor fixes and improvements

README.md

@@ -11,9 +11,9 @@ EasyEngine (ee) is a python tool, which makes it easy to manage your wordpress s
 - Debian 7 & 8
 
 **Port Requirements:**
-- 22/TCP (Inbound/Outbound) : Standerd SSH port
-- 80/TCP (Inbound/Outbound) : Standerd HTTP port
-- 443/TCP(Inbound/Outbound) : Standerd HTTPS port
+- 22/TCP (Inbound/Outbound) : Standard SSH port
+- 80/TCP (Inbound/Outbound) : Standard HTTP port
+- 443/TCP(Inbound/Outbound) : Standard HTTPS port
 - 22222/TCP (Inbound)       : To access EasyEngine admin tools
 - 11371/TCP (Outbound)      : To connect to GPG Key Server
 

config/bash_completion.d/ee_auto.rc

@@ -74,7 +74,7 @@ _ee_complete()
             # HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
             "install" | "purge" | "remove" )
                 COMPREPLY=( $(compgen \
-                              -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
+                              -W "--pagespeed --web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
                               -- $cur) )
                 ;;
             "upgrade" )
@@ -235,9 +235,9 @@ _ee_complete()
 
         "--pagespeed" | "--hhvm")
             if [ ${COMP_WORDS[2]} == "create" ]; then
-                retlist="--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed"
+                retlist="--user --pass --email --html --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --pagespeed --experimenal"
             elif [ ${COMP_WORDS[2]} == "update" ]; then
-                retlist="--password --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off"
+                retlist="--password --php --mysql --wp  --wpsubdir --wpsubdomain --w3tc --wpfc --wpsc --hhvm --hhvm=off --pagespeed --pagespeed=off --experimenal"
             else
                 retlist=""
             fi

ee/cli/plugins/debug.py

@@ -171,8 +171,16 @@ def debug_php(self):
                                                "{/,/}/p \" /etc/nginx/"
                                                "conf.d/upstream.conf "
                                                "| grep 9001")):
+
                 Log.info(self, "Enabling PHP debug")
-                data = dict(php="9001", debug="9001", hhvm="9001")
+                # Check HHVM is installed if not instlled then dont not enable
+                # it in upstream config
+                if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"):
+                    hhvmconf=True
+                else:
+                    hhvmconf=False
+                data = dict(php="9001", debug="9001", hhvm="9001",
+                            hhvmconf=hhvmconf)
                 Log.debug(self, 'Writting the Nginx debug configration to file'
                                 ' /etc/nginx/conf.d/upstream.conf ')
                 ee_nginx = open('/etc/nginx/conf.d/upstream.conf',
@@ -209,6 +217,16 @@ def debug_php(self):
                                           "/etc/nginx/conf.d/upstream.conf "
                                           "| grep 9001"):
                 Log.info(self, "Disabling PHP debug")
+
+                # Check HHVM is installed if not instlled then dont not enable
+                # it in upstream config
+                if os.path.isfile("/etc/nginx/common/wpfc-hhvm.conf"):
+                    hhvmconf=True
+                else:
+                    hhvmconf=False
+                data = dict(php="9001", debug="9001", hhvm="9001",
+                            hhvmconf=hhvmcof)
+
                 data = dict(php="9000", debug="9001", hhvm="8000")
                 Log.debug(self, 'Writting the Nginx debug configration to file'
                           ' /etc/nginx/conf.d/upstream.conf ')

ee/cli/plugins/site.py

@@ -359,7 +359,10 @@ class Meta:
                 dict(help="provide password for wordpress user",
                      dest='wppass')),
             (['--proxy'],
-                dict(help="create proxy for site", nargs='+'))
+                dict(help="create proxy for site", nargs='+')),
+            (['--experimental'],
+                dict(help="Enable Experimenal packages without prompt",
+                     action='store_true')),
             ]
 
     @expose(hide=True)
@@ -461,21 +464,56 @@ def default(self):
             Log.error(self, "Can not create HTML site with HHVM")
 
         if data and self.app.pargs.hhvm:
-            data['hhvm'] = True
-            hhvm = 1
+            if (not self.app.pargs.experimental):
+                Log.info(self, "HHVM is experimental feature and it may not"
+                         "work with all plugins of your site.\nYou can "
+                         "disable it by passing --hhvm=off later.\nDo you wish"
+                         " to enable HHVM now for {0}?".format(ee_domain))
+
+                # Check prompt
+                check_prompt = input("Type \"y\" to continue [n]:")
+                if check_prompt != "Y" and check_prompt != "y":
+                    Log.info(self, "Not using HHVM for site.")
+                    data['hhvm'] = False
+                    hhvm = 0
+                    self.app.pargs.hhvm = False
+                else:
+                    data['hhvm'] = True
+                    hhvm = 1
+            else:
+                data['hhvm'] = True
+                hhvm = 1
+
         elif data:
             data['hhvm'] = False
             hhvm = 0
 
         if data and self.app.pargs.pagespeed:
-            data['pagespeed'] = True
-            pagespeed = 1
+            if (not self.app.pargs.experimental):
+                Log.info(self, "PageSpeed is experimental feature and it may not"
+                         "work with all CSS/JS/Cache of your site.\nYou can "
+                         "disable it by passing --pagespeed=off later.\nDo you wish"
+                         " to enable PageSpeed now for {0}?".format(ee_domain))
+
+                # Check prompt
+                check_prompt = input("Type \"y\" to continue [n]:")
+                if check_prompt != "Y" and check_prompt != "y":
+                    Log.info(self, "Not using PageSpeed for site.")
+                    data['pagespeed'] = False
+                    pagespeed = 0
+                    self.app.pargs.pagespeed = False
+                else:
+                    data['pagespeed'] = True
+                    pagespeed = 1
+            else:
+                data['pagespeed'] = True
+                pagespeed = 1
         elif data:
             data['pagespeed'] = False
             pagespeed = 0
 
-        # if not data:
         #     self.app.args.print_help()
+        # if not data:
         #     self.app.close(1)
 
         # Check rerequired packages are installed or not
@@ -704,7 +742,10 @@ class Meta:
                      action='store' or 'store_const',
                      choices=('on', 'off'), const='on', nargs='?')),
             (['--proxy'],
-                dict(help="update to prxy site", nargs='+')),
+                dict(help="update to proxy site", nargs='+')),
+            (['--experimental'],
+                dict(help="Enable Experimenal packages without prompt",
+                     action='store_true')),
             (['--all'],
                 dict(help="update all sites", action='store_true')),
             ]
@@ -939,6 +980,7 @@ def doupdatesite(self, pargs):
                 elif pagespeed is True:
                     Log.info(self, "Pagespeed is allready enabled for given "
                              "site")
+                pargs.pagespeed = False
 
         if pargs.hhvm:
             if hhvm is old_hhvm:
@@ -949,6 +991,8 @@ def doupdatesite(self, pargs):
                     Log.info(self, "HHVM is allready enabled for given "
                              "site")
 
+                pargs.hhvm = False
+
         if data and (not pargs.hhvm):
             if old_hhvm is True:
                 data['hhvm'] = True
@@ -965,10 +1009,50 @@ def doupdatesite(self, pargs):
                 data['pagespeed'] = False
                 pagespeed = False
 
-        if pargs.pagespeed or pargs.hhvm:
-            if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
-               (stype == oldsitetype and cache == oldcachetype)):
-                return 1
+        if pargs.pagespeed=="on" or pargs.hhvm=="on":
+            if pargs.hhvm == "on":
+                if (not pargs.experimental):
+                    Log.info(self, "HHVM is experimental feature and it may not"
+                             " work with all plugins of your site.\nYou can "
+                             "disable it by passing --hhvm=off later.\nDo you wish"
+                             " to enable HHVM now for {0}?".format(ee_domain))
+
+                    # Check prompt
+                    check_prompt = input("Type \"y\" to continue [n]:")
+                    if check_prompt != "Y" and check_prompt != "y":
+                        Log.info(self, "Not using HHVM for site")
+                        data['hhvm'] = False
+                        hhvm = False
+                    else:
+                        data['hhvm'] = True
+                        hhvm = True
+                else:
+                    data['hhvm'] = True
+                    hhvm = True
+
+            if pargs.pagespeed=="on":
+                if (not pargs.experimental):
+                    Log.info(self, "PageSpeed is experimental feature and it may not"
+                             " work with all CSS/JS/Cache of your site.\nYou can "
+                             "disable it by passing --pagespeed=off later.\nDo you wish"
+                             " to enable PageSpeed now for {0}?".format(ee_domain))
+
+                    # Check prompt
+                    check_prompt = input("Type \"y\" to continue [n]:")
+                    if check_prompt != "Y" and check_prompt != "y":
+                        Log.info(self, "Not using Pagespeed for given site")
+                        data['pagespeed'] = False
+                        pagespeed = False
+                    else:
+                        data['pagespeed'] = True
+                        pagespeed = True
+                else:
+                    data['pagespeed'] = True
+                    pagespeed = True
+
+        if ((hhvm is old_hhvm) and (pagespeed is old_pagespeed) and
+            (stype == oldsitetype and cache == oldcachetype)):
+            return 1
 
         if not data:
             Log.error(self, "Cannot update {0}, Invalid Options"

ee/cli/plugins/site_functions.py

@@ -91,15 +91,16 @@ def setupdomain(self, data):
             raise SiteError("created nginx configuration failed for site."
                             " check with `nginx -t`")
 
-    if 'proxy' in data.keys() and data['proxy']:
-        return
 
     # create symbolic link for
     EEFileUtils.create_symlink(self, ['/etc/nginx/sites-available/{0}'
                                       .format(ee_domain_name),
                                       '/etc/nginx/sites-enabled/{0}'
                                       .format(ee_domain_name)])
 
+    if 'proxy' in data.keys() and data['proxy']:
+        return
+
     # Creating htdocs & logs directory
     Log.info(self, "Setting up webroot \t\t", end='')
     try: