Merge branch 'HHVM-Issue'

Author: gau1991

ee/cli/plugins/site_functions.py

@@ -571,10 +571,44 @@ def site_package_check(self, stype):
         if not EEAptGet.is_installed(self, 'hhvm'):
             apt_packages = apt_packages + EEVariables.ee_hhvm
 
+        if os.path.isdir("/etc/nginx/common") and (not
+           os.path.isfile("/etc/nginx/common/php-hhvm.conf")):
+            data = dict()
+            Log.debug(self, 'Writting the nginx configuration to '
+                      'file /etc/nginx/common/php-hhvm.conf')
+            ee_nginx = open('/etc/nginx/common/php-hhvm.conf',
+                            encoding='utf-8', mode='w')
+            self.app.render((data), 'php-hhvm.mustache',
+                            out=ee_nginx)
+            ee_nginx.close()
+
+            Log.debug(self, 'Writting the nginx configuration to '
+                      'file /etc/nginx/common/w3tc-hhvm.conf')
+            ee_nginx = open('/etc/nginx/common/w3tc-hhvm.conf',
+                            encoding='utf-8', mode='w')
+            self.app.render((data), 'w3tc-hhvm.mustache', out=ee_nginx)
+            ee_nginx.close()
+
+            Log.debug(self, 'Writting the nginx configuration to '
+                      'file /etc/nginx/common/wpfc-hhvm.conf')
+            ee_nginx = open('/etc/nginx/common/wpfc-hhvm.conf',
+                            encoding='utf-8', mode='w')
+            self.app.render((data), 'wpfc-hhvm.mustache',
+                            out=ee_nginx)
+            ee_nginx.close()
+
+            Log.debug(self, 'Writting the nginx configuration to '
+                      'file /etc/nginx/common/wpsc-hhvm.conf')
+            ee_nginx = open('/etc/nginx/common/wpsc-hhvm.conf',
+                            encoding='utf-8', mode='w')
+            self.app.render((data), 'wpsc-hhvm.mustache',
+                            out=ee_nginx)
+            ee_nginx.close()
+
     # Check if Nginx is allready installed and Pagespeed config there or not
     # If not then copy pagespeed config
     if self.app.pargs.pagespeed:
-        if (os.path.isdir('/etc/nginx') and
+        if (os.path.isfile('/etc/nginx/nginx.conf') and
            (not os.path.isfile('/etc/nginx/conf.d/pagespeed.conf'))):
             # Pagespeed configuration
             data = dict()

ee/cli/plugins/stack.py

@@ -588,6 +588,9 @@ def post_pref(self, apt_packages, packages):
                 EEService.reload_service(self, 'php5-fpm')
 
             if set(EEVariables.ee_hhvm).issubset(set(apt_packages)):
+
+                EEShellExec.cmd_exec(self, "update-rc.d hhvm defaults")
+                
                 EEFileUtils.searchreplace(self, "/etc/hhvm/server.ini",
                                                 "9000", "8000")
                 EEFileUtils.searchreplace(self, "/etc/nginx/hhvm.conf",
@@ -624,9 +627,8 @@ def post_pref(self, apt_packages, packages):
 
                 EEGit.add(self, ["/etc/hhvm"], msg="Adding HHVM into Git")
                 EEService.restart_service(self, 'hhvm')
-                EEService.reload_service(self, 'nginx')
 
-                if os.path.isdir("/etc/nginx") and (not
+                if os.path.isfile("/etc/nginx/nginx.conf") and (not
                    os.path.isfile("/etc/nginx/common/php-hhvm.conf")):
 
                     data = dict()
@@ -662,6 +664,8 @@ def post_pref(self, apt_packages, packages):
                                     out=ee_nginx)
                     ee_nginx.close()
 
+                    EEService.reload_service(self, 'nginx')
+
             if set(EEVariables.ee_mysql).issubset(set(apt_packages)):
                 # TODO: Currently we are using, we need to remove it in future
                 # config = configparser.ConfigParser()