include error

ee/cli/plugins/stack.py

@@ -885,7 +885,7 @@ class EEStackController(CementBaseController):
                 config['global']['error_log'] = '/var/log/php/5.6/fpm.log'
                 config.remove_option('global', 'include')
                 config['global']['log_level'] = 'notice'
-                config['global']['include'] = '/etc/php/5.6/fpm/pool.d/*.conf'
+              #  config['global']['include'] = '/etc/php/5.6/fpm/pool.d/*.conf'
                 with codecs.open('/etc/php/5.6/fpm/php-fpm.conf',
                                  encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "writting php5 configuration into "
@@ -939,6 +939,7 @@ class EEStackController(CementBaseController):
                                  "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",
@@ -1012,7 +1013,7 @@ class EEStackController(CementBaseController):
                 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'
+                #config['global']['include'] = '/etc/php/7.0/fpm/pool.d/*.conf'
                 with codecs.open('/etc/php/7.0/fpm/php-fpm.conf',
                                  encoding='utf-8', mode='w') as configfile:
                     Log.debug(self, "writting php5 configuration into "
@@ -1066,6 +1067,7 @@ class EEStackController(CementBaseController):
                                  "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",

ee/core/variables.py

@@ -123,11 +123,11 @@ class EEVariables():
             ee_php5_6 = ["php5.6-fpm", "php5.6-curl", "php5.6-gd", "php5.6-imap",
                         "php5.6-mcrypt", "php5.6-common", "php5.6-readline",
                         "php5.6-mysql", "php5.6-cli", "php-memcached", "php-imagick",
-                        "memcached", "graphviz", "php-pear"]
+                        "memcached", "graphviz", "php-pear", "php-xdebug"]
             ee_php7_0 = ["php7.0-fpm", "php7.0-curl", "php7.0-gd", "php7.0-imap",
                           "php7.0-mcrypt", "php7.0-common", "php7.0-readline",
                           "php7.0-mysql", "php7.0-cli", "php-memcached", "php-imagick",
-                          "memcached", "graphviz", "php-pear"]
+                          "memcached", "graphviz", "php-pear", "php-xdebug"]
     elif ee_platform_distro == 'debian':
         if ee_platform_codename == 'wheezy':
             ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php56 all"
@@ -140,11 +140,7 @@ class EEVariables():
     if ee_platform_codename == 'wheezy':
         ee_php = ee_php + ["php5-dev"]
 
-    if ee_platform_distro == 'ubuntu' or ee_platform_codename == 'jessie':
-        if ee_platform_codename == 'trusty':
-            ee_php = ee_php5_6 + ["php-xdebug"]
-            ee_php = ee_php7_0 + ["php-xdebug"]
-        else:
+    if ee_platform_codename == 'precise' or ee_platform_codename == 'jessie':
         ee_php = ee_php + ["php5-xdebug"]
 
     # MySQL repo and packages