Merge branch 'feature/v3.7.0' into develop

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,7 @@
+v3.7.0 - Jun 22, 2016
+- PHP7 support for debian jessie
+- Fixed Issue #729, #724
+
 v3.6.2 - Jun 03, 2016
 - Fix Issue #726,#723,#727
 - Update Adminer to v4.2.5

ee/cli/plugins/debug.py

@@ -293,7 +293,7 @@ def debug_php7(self):
         # PHP global debug start
 
         if (self.app.pargs.php7 == 'on' and not self.app.pargs.site_name):
-            if (EEVariables.ee_platform_distro == 'debian' or EEVariables.ee_platform_codename == 'precise'):
+            if (EEVariables.ee_platform_codename == 'wheezy' or EEVariables.ee_platform_codename == 'precise'):
                 Log.error(self,"PHP 7.0 not supported.")
             if not (EEShellExec.cmd_exec(self, "sed -n \"/upstream php7"
                                                "{/,/}/p \" /etc/nginx/"
@@ -311,7 +311,13 @@ def debug_php7(self):
                 nc.savef('/etc/nginx/conf.d/upstream.conf')
 
                 # Enable xdebug
-                EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
+                if (EEVariables.ee_platform_codename != 'jessie'):
+                    EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
+                                              "xdebug.ini",
+                                              ";zend_extension",
+                                              "zend_extension")
+                else:
+                    EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
                                               "xdebug.ini",
                                               ";zend_extension",
                                               "zend_extension")
@@ -350,7 +356,13 @@ def debug_php7(self):
                 nc.savef('/etc/nginx/conf.d/upstream.conf')
 
                 # Disable xdebug
-                EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
+                if (EEVariables.ee_platform_codename != 'jessie'):
+                    EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
+                                          "xdebug.ini",
+                                          "zend_extension",
+                                          ";zend_extension")
+                else:
+                    EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
                                           "xdebug.ini",
                                           "zend_extension",
                                           ";zend_extension")

ee/cli/plugins/site_functions.py

@@ -733,12 +733,17 @@ def site_package_check(self, stype):
             if not EEAptGet.is_installed(self, 'php7.0-fpm'):
                 apt_packages = apt_packages + EEVariables.ee_php7_0 + EEVariables.ee_php_extra
         else:
-            Log.warn(self, "PHP 7.0 not available for your system.")
-            Log.info(self,"Creating site with PHP 5.6")
-            if not EEAptGet.is_installed(self, 'php5-fpm'):
-                Log.info(self, "Setting apt_packages variable for PHP")
-                Log.debug(self, "Setting apt_packages variable for PHP")
-                apt_packages = apt_packages + EEVariables.ee_php
+            if EEVariables.ee_platform_codename == 'wheezy':
+                Log.warn(self, "PHP 7.0 not available for your system.")
+                Log.info(self,"Creating site with PHP 5.6")
+                if not EEAptGet.is_installed(self, 'php5-fpm'):
+                    Log.info(self, "Setting apt_packages variable for PHP")
+                    Log.debug(self, "Setting apt_packages variable for PHP")
+                    apt_packages = apt_packages + EEVariables.ee_php
+            else:
+                Log.debug(self, "Setting apt_packages variable for PHP 7.0")
+                if not EEAptGet.is_installed(self, 'php7.0-fpm'):
+                    apt_packages = apt_packages + EEVariables.ee_php7_0
 
     if stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
         Log.debug(self, "Setting apt_packages variable for MySQL")
@@ -858,7 +863,7 @@ def site_package_check(self, stype):
                                     "server 127.0.0.1:9000 backup;\n}\n")
 
     if self.app.pargs.php7:
-        if (EEVariables.ee_platform_distro == 'debian' or EEVariables.ee_platform_codename == 'precise'):
+        if (EEVariables.ee_platform_codename == 'wheezy' or EEVariables.ee_platform_codename == 'precise'):
             Log.error(self,"PHP 7.0 is not supported in your Platform")
 
         Log.debug(self, "Setting apt_packages variable for PHP 7.0")

ee/cli/plugins/stack.py

@@ -209,6 +209,13 @@ def pre_pref(self, apt_packages):
                     Log.debug(self, 'Adding ppa for PHP')
                     EERepo.add(self, ppa=EEVariables.ee_php_repo)
 
+            if EEVariables.ee_platform_codename == 'jessie':
+                if set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
+                    Log.debug(self, 'Adding repo_url of php 7.0 for debian')
+                    EERepo.add(self, repo_url=EEVariables.ee_php_repo)
+                    Log.debug(self, 'Adding Dotdeb/php GPG key')
+                    EERepo.add_key(self, '89DF5277')
+
         if set(EEVariables.ee_hhvm).issubset(set(apt_packages)):
             if EEVariables.ee_platform_codename != 'xenial':
                 Log.info(self, "Adding repository for HHVM, please wait...")
@@ -391,7 +398,7 @@ def post_pref(self, apt_packages, packages):
                     ee_nginx.close()
 
                     #php7 conf
-                    if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') and (not
+                    if (EEVariables.ee_platform_codename == 'jessie' or EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') and (not
                         os.path.isfile("/etc/nginx/common/php7.conf")):
                         #data = dict()
                         Log.debug(self, 'Writting the nginx configuration to '
@@ -1156,9 +1163,9 @@ def post_pref(self, apt_packages, packages):
                 EEGit.add(self, ["/etc/php"], msg="Adding PHP into Git")
                 EEService.restart_service(self, 'php5.6-fpm')
 
-            #preconfiguration for php7.0
-            if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') and set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
-                # Create log directories
+        #PHP7.0 configuration for debian
+            if (EEVariables.ee_platform_codename == 'jessie' ) and set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
+                 # Create log directories
                 if not os.path.exists('/var/log/php/7.0/'):
                     Log.debug(self, 'Creating directory /var/log/php/7.0/')
                     os.makedirs('/var/log/php/7.0/')
@@ -1179,23 +1186,128 @@ def post_pref(self, apt_packages, packages):
                     config.write(configfile)
 
                 # Parse /etc/php/7.0/fpm/php-fpm.conf
-                '''
-                #Depreciated code. Mustache version applied
+                data = dict(pid="/run/php/php7.0-fpm.pid", error_log="/var/log/php7.0-fpm.log",
+                              include="/etc/php/7.0/fpm/pool.d/*.conf")
+                Log.debug(self, "writting php 7.0 configuration into "
+                              "/etc/php/7.0/fpm/php-fpm.conf")
+                ee_php_fpm = open('/etc/php/7.0/fpm/php-fpm.conf',
+                                   encoding='utf-8', mode='w')
+                self.app.render((data), 'php-fpm.mustache', out=ee_php_fpm)
+                ee_php_fpm.close()
+
+                # Parse /etc/php/7.0/fpm/pool.d/www.conf
                 config = configparser.ConfigParser()
-                Log.debug(self, "configuring php file"
-                          "/etc/php/7.0/fpm/php-fpm.conf")
-                config.read_file(codecs.open("/etc/php/7.0/fpm/php-fpm.conf",
+                config.read_file(codecs.open('/etc/php/7.0/fpm/pool.d/www.conf',
                                              "r", "utf8"))
-                config['global']['error_log'] = '/var/log/php/7.0/fpm.log'
-                config.remove_option('global', 'include')
-                config['global']['log_level'] = 'notice'
-                config['global']['include'] = '/etc/php/7.0/fpm/pool.d/*.conf'
-                with codecs.open('/etc/php/7.0/fpm/php-fpm.conf',
+                config['www']['ping.path'] = '/ping'
+                config['www']['pm.status_path'] = '/status'
+                config['www']['pm.max_requests'] = '500'
+                config['www']['pm.max_children'] = '100'
+                config['www']['pm.start_servers'] = '20'
+                config['www']['pm.min_spare_servers'] = '10'
+                config['www']['pm.max_spare_servers'] = '30'
+                config['www']['request_terminate_timeout'] = '300'
+                config['www']['pm'] = 'ondemand'
+                config['www']['listen'] = '127.0.0.1:9070'
+                with codecs.open('/etc/php/7.0/fpm/pool.d/www.conf',
                                  encoding='utf-8', mode='w') as configfile:
-                    Log.debug(self, "writting php5 configuration into "
-                              "/etc/php/7.0/fpm/php-fpm.conf")
+                    Log.debug(self, "writting PHP5 configuration into "
+                              "/etc/php/7.0/fpm/pool.d/www.conf")
                     config.write(configfile)
-                '''
+
+                # Generate /etc/php/7.0/fpm/pool.d/debug.conf
+                EEFileUtils.copyfile(self, "/etc/php/7.0/fpm/pool.d/www.conf",
+                                     "/etc/php/7.0/fpm/pool.d/debug.conf")
+                EEFileUtils.searchreplace(self, "/etc/php/7.0/fpm/pool.d/"
+                                          "debug.conf", "[www]", "[debug]")
+                config = configparser.ConfigParser()
+                config.read('/etc/php/7.0/fpm/pool.d/debug.conf')
+                config['debug']['listen'] = '127.0.0.1:9170'
+                config['debug']['rlimit_core'] = 'unlimited'
+                config['debug']['slowlog'] = '/var/log/php/7.0/slow.log'
+                config['debug']['request_slowlog_timeout'] = '10s'
+                with open('/etc/php/7.0/fpm/pool.d/debug.conf',
+                          encoding='utf-8', mode='w') as confifile:
+                    Log.debug(self, "writting PHP5 configuration into "
+                              "/etc/php/7.0/fpm/pool.d/debug.conf")
+                    config.write(confifile)
+
+                with open("/etc/php/7.0/fpm/pool.d/debug.conf",
+                          encoding='utf-8', mode='a') as myfile:
+                    myfile.write("php_admin_value[xdebug.profiler_output_dir] "
+                                 "= /tmp/ \nphp_admin_value[xdebug.profiler_"
+                                 "output_name] = cachegrind.out.%p-%H-%R "
+                                 "\nphp_admin_flag[xdebug.profiler_enable"
+                                 "_trigger] = on \nphp_admin_flag[xdebug."
+                                 "profiler_enable] = off\n")
+
+                # Disable xdebug
+                if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/mods-available/xdebug.ini"):
+                    EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
+                                          "xdebug.ini",
+                                          "zend_extension",
+                                          ";zend_extension")
+
+                # PHP and Debug pull configuration
+                if not os.path.exists('{0}22222/htdocs/fpm/status/'
+                                      .format(EEVariables.ee_webroot)):
+                    Log.debug(self, 'Creating directory '
+                              '{0}22222/htdocs/fpm/status/ '
+                              .format(EEVariables.ee_webroot))
+                    os.makedirs('{0}22222/htdocs/fpm/status/'
+                                .format(EEVariables.ee_webroot))
+                open('{0}22222/htdocs/fpm/status/debug'
+                     .format(EEVariables.ee_webroot),
+                     encoding='utf-8', mode='a').close()
+                open('{0}22222/htdocs/fpm/status/php'
+                     .format(EEVariables.ee_webroot),
+                     encoding='utf-8', mode='a').close()
+
+                # Write info.php
+                if not os.path.exists('{0}22222/htdocs/php/'
+                                      .format(EEVariables.ee_webroot)):
+                    Log.debug(self, 'Creating directory '
+                              '{0}22222/htdocs/php/ '
+                              .format(EEVariables.ee_webroot))
+                    os.makedirs('{0}22222/htdocs/php'
+                                .format(EEVariables.ee_webroot))
+
+                with open("{0}22222/htdocs/php/info.php"
+                          .format(EEVariables.ee_webroot),
+                          encoding='utf-8', mode='w') as myfile:
+                    myfile.write("<?php\nphpinfo();\n?>")
+
+                EEFileUtils.chown(self, "{0}22222"
+                                  .format(EEVariables.ee_webroot),
+                                  EEVariables.ee_php_user,
+                                  EEVariables.ee_php_user, recursive=True)
+
+                EEGit.add(self, ["/etc/php"], msg="Adding PHP into Git")
+                EEService.restart_service(self, 'php7.0-fpm')
+
+            #preconfiguration for php7.0
+            if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') and set(EEVariables.ee_php7_0).issubset(set(apt_packages)):
+                # Create log directories
+                if not os.path.exists('/var/log/php/7.0/'):
+                    Log.debug(self, 'Creating directory /var/log/php/7.0/')
+                    os.makedirs('/var/log/php/7.0/')
+
+                # Parse etc/php/7.0/fpm/php.ini
+                config = configparser.ConfigParser()
+                Log.debug(self, "configuring php file /etc/php/7.0/fpm/php.ini")
+                config.read('/etc/php/7.0/fpm/php.ini')
+                config['PHP']['expose_php'] = 'Off'
+                config['PHP']['post_max_size'] = '100M'
+                config['PHP']['upload_max_filesize'] = '100M'
+                config['PHP']['max_execution_time'] = '300'
+                config['PHP']['date.timezone'] = EEVariables.ee_timezone
+                with open('/etc/php/7.0/fpm/php.ini',
+                          encoding='utf-8', mode='w') as configfile:
+                    Log.debug(self, "Writting php configuration into "
+                              "/etc/php/7.0/fpm/php.ini")
+                    config.write(configfile)
+
+                # Parse /etc/php/7.0/fpm/php-fpm.conf
                 data = dict(pid="/run/php/php7.0-fpm.pid", error_log="/var/log/php/7.0/fpm.log",
                               include="/etc/php/7.0/fpm/pool.d/*.conf")
                 Log.debug(self, "writting php 7.0 configuration into "
@@ -2260,6 +2372,21 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
                     Log.debug(self, "PHP already installed")
                     Log.info(self, "PHP already installed")
 
+        #PHP 7.0 for Debian (jessie+)
+            if self.app.pargs.php7:
+                if (EEVariables.ee_platform_codename == 'jessie'):
+                    Log.debug(self, "Setting apt_packages variable for PHP 7.0")
+                    if not EEAptGet.is_installed(self, 'php7.0-fpm') :
+                        apt_packages = apt_packages + EEVariables.ee_php7_0
+                        if not EEAptGet.is_installed(self, 'php5-fpm'):
+                            apt_packages = apt_packages + EEVariables.ee_php
+                    else:
+                        Log.debug(self, "PHP 7.0 already installed")
+                        Log.info(self, "PHP 7.0 already installed")
+                else:
+                    Log.debug(self, "PHP 7.0  Not Available for your Distribution")
+                    Log.info(self, "PHP 7.0  Not Available for your Distribution")
+
 
             if self.app.pargs.php7:
                 if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial'):
@@ -2533,6 +2660,16 @@ def remove(self):
             else:
                 apt_packages = apt_packages + EEVariables.ee_php
 
+        #PHP7.0 for debian(jessie+)
+        if self.app.pargs.php7:
+            if (EEVariables.ee_platform_codename == 'jessie'):
+                Log.debug(self, "Removing apt_packages variable of PHP 7.0")
+                apt_packages = apt_packages + EEVariables.ee_php7_0
+                if not EEAptGet.is_installed(self, 'php5-fpm'):
+                    apt_packages = apt_packages + EEVariables.ee_php_extra
+            else:
+                Log.info(self,"PHP 7.0 not supported.")
+
         if self.app.pargs.php7:
             if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial'):
                 Log.debug(self, "Removing apt_packages variable of PHP 7.0")
@@ -2615,6 +2752,7 @@ def remove(self):
 
                 Log.info(self, "Successfully removed packages")
 
+                #Added for Ondrej Repo missing package Fix
                 if self.app.pargs.php7:
                     if EEAptGet.is_installed(self, 'php5.6-fpm'):
                         Log.info(self, "PHP5.6-fpm found on system.")
@@ -2704,6 +2842,17 @@ def purge(self):
                     apt_packages = apt_packages + EEVariables.ee_php_extra
             else:
                 apt_packages = apt_packages + EEVariables.ee_php
+
+        #For debian --php7
+        if self.app.pargs.php7:
+            if (EEVariables.ee_platform_codename == 'jessie'):
+                Log.debug(self, "Removing apt_packages variable of PHP 7.0")
+                apt_packages = apt_packages + EEVariables.ee_php7_0
+                if not EEAptGet.is_installed(self, 'php5-fpm'):
+                    apt_packages = apt_packages + EEVariables.ee_php_extra
+            else:
+                Log.info(self,"PHP 7.0 not supported.")
+
         if self.app.pargs.php7:
             if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial'):
                 Log.debug(self, "Removing apt_packages variable of PHP 7.0")
@@ -2788,6 +2937,7 @@ def purge(self):
 
                 Log.info(self, "Successfully purged packages")
 
+                #Added for php Ondrej repo missing package fix
                 if self.app.pargs.php7:
                     if EEAptGet.is_installed(self, 'php5.6-fpm'):
                         Log.info(self, "PHP5.6-fpm found on system.")

ee/cli/plugins/stack_upgrade.py

@@ -167,12 +167,13 @@ def default(self):
                         apt_packages = apt_packages + EEVariables.ee_php
                     else:
                         Log.info(self, "PHP is not installed")
+                    if EEAptGet.is_installed(self, 'php7.0-fpm'):
+                        apt_packages = apt_packages + EEVariables.ee_php7_0
                 else:
                     if EEAptGet.is_installed(self, 'php5.6-fpm'):
                         apt_packages = apt_packages + EEVariables.ee_php5_6 + EEVariables.ee_php_extra
                     else:
                         Log.info(self, "PHP 5.6 is not installed")
-
                     if EEAptGet.is_installed(self, 'php7.0-fpm'):
                         apt_packages = apt_packages + EEVariables.ee_php7_0 + EEVariables.ee_php_extra
                     else:

ee/cli/templates/redis-hhvm.mustache

@@ -3,7 +3,7 @@
 set $skip_cache 0;
 # POST requests and URL with a query string should always go to php
 if ($request_method = POST) {
-  set $skip_cache 0;
+  set $skip_cache 1;
 }
 if ($query_string != "") {
   set $skip_cache 1;

ee/cli/templates/redis-php7.mustache

@@ -3,7 +3,7 @@
 set $skip_cache 0;
 # POST requests and URL with a query string should always go to php
 if ($request_method = POST) {
-  set $skip_cache 0;
+  set $skip_cache 1;
 }
 if ($query_string != "") {
   set $skip_cache 1;

ee/cli/templates/redis.mustache

@@ -3,7 +3,7 @@
 set $skip_cache 0;
 # POST requests and URL with a query string should always go to php
 if ($request_method = POST) {
-  set $skip_cache 0;
+  set $skip_cache 1;
 }
 if ($query_string != "") {
   set $skip_cache 1;