Merge branch 'PHP5.6'

config/bash_completion.d/ee_auto.rc

@@ -35,7 +35,7 @@ _ee_complete()
 
             "stack")
                 COMPREPLY=( $(compgen \
-                              -W "install purge reload remove restart start status stop migrate" \
+                              -W "upgrade install purge reload remove restart start status stop migrate" \
                               -- $cur) )
                 ;;
 
@@ -74,7 +74,12 @@ _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 --memcache --dovecot --all --mailscanner --hhvm" \
+                              -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --all --mailscanner --hhvm" \
+                              -- $cur) )
+                ;;
+            "upgrade" )
+                COMPREPLY=( $(compgen \
+                              -W "--web --mail --nginx --php --mysql --postfix --all --hhvm --php56 --no-prompt" \
                               -- $cur) )
                 ;;
             "start" | "stop" | "reload" | "restart" | "status")

ee/cli/plugins/stack.py

@@ -27,6 +27,7 @@ import grp
 import codecs
 from ee.cli.plugins.stack_services import EEStackStatusController
 from ee.cli.plugins.stack_migrate import EEStackMigrateController
+from ee.cli.plugins.stack_upgrade import EEStackUpgradeController
 from ee.core.logging import Log
 
 
@@ -469,6 +470,21 @@ class EEStackController(CementBaseController):
                     Log.debug(self, 'Creating directory /var/log/php5/')
                     os.makedirs('/var/log/php5/')
 
+                # For debian install xdebug
+
+                if EEVariables.ee_platform_distro == "debian":
+                    EEShellExec.cmd_exec(self, "pecl install xdebug")
+
+                    with open("/etc/php5/mods-available/xdebug.ini",
+                              encoding='utf-8', mode='a') as myfile:
+                        myfile.write("zend_extension=/usr/lib/php5/20131226/"
+                                     "xdebug.so\n")
+
+                    EEFileUtils.create_symlink(self, ["/etc/php5/"
+                                               "mods-available/xdebug.ini",
+                                                      "/etc/php5/fpm/conf.d"
+                                                      "/20-xedbug.ini"])
+
                 # Parse etc/php5/fpm/php.ini
                 config = configparser.ConfigParser()
                 Log.debug(self, "configuring php file /etc/php5/fpm/php.ini")
@@ -590,7 +606,7 @@ class EEStackController(CementBaseController):
             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",
@@ -1803,6 +1819,7 @@ def load(app):
     handler.register(EEStackController)
     handler.register(EEStackStatusController)
     handler.register(EEStackMigrateController)
+    handler.register(EEStackUpgradeController)
 
     # register a hook (function) to run after arguments are parsed.
     hook.register('post_argument_parsing', ee_stack_hook)

ee/cli/plugins/stack_upgrade.py

@@ -0,0 +1,195 @@
+from cement.core.controller import CementBaseController, expose
+from cement.core import handler, hook
+from ee.core.logging import Log
+from ee.core.variables import EEVariables
+from ee.core.aptget import EEAptGet
+from ee.core.apt_repo import EERepo
+from ee.core.services import EEService
+from ee.core.fileutils import EEFileUtils
+from ee.core.shellexec import EEShellExec
+import configparser
+import os
+
+
+class EEStackUpgradeController(CementBaseController):
+    class Meta:
+        label = 'upgrade'
+        stacked_on = 'stack'
+        stacked_type = 'nested'
+        description = ('Upgrade stack safely')
+        arguments = [
+            (['--all'],
+                dict(help='Upgrade all stack', action='store_true')),
+            (['--web'],
+                dict(help='Upgrade web stack', action='store_true')),
+            (['--admin'],
+                dict(help='Upgrade admin tools stack', action='store_true')),
+            (['--mail'],
+                dict(help='Upgrade mail server stack', action='store_true')),
+            (['--mailscanner'],
+                dict(help='Upgrade mail scanner stack', action='store_true')),
+            (['--nginx'],
+                dict(help='Upgrade Nginx stack', action='store_true')),
+            (['--php'],
+                dict(help='Upgrade PHP stack', action='store_true')),
+            (['--mysql'],
+                dict(help='Upgrade MySQL stack', action='store_true')),
+            (['--hhvm'],
+                dict(help='Upgrade HHVM stack', action='store_true')),
+            (['--postfix'],
+                dict(help='Upgrade Postfix stack', action='store_true')),
+            (['--php56'],
+                dict(help="Upgrade to PHP5.6 from PHP5.5",
+                     action='store_true')),
+            (['--no-prompt'],
+                dict(help="Upgrade Packages without any prompt",
+                     action='store_true')),
+            ]
+
+    @expose(hide=True)
+    def upgrade_php56(self):
+        if EEVariables.ee_platform_distro == "Ubuntu":
+            if not os.path.isfile("/etc/apt/sources.list.d/"
+                                  "ondrej-php5-trusty.list"):
+                Log.error(self, "Unable to find PHP 5.5")
+        else:
+            if not(os.path.isfile(EEVariables.ee_repo_file_path) and
+                   EEFileUtils.grep(self, EEVariables.ee_repo_file_path,
+                                    "php55")):
+                Log.error(self, "Unable to find PHP 5.5")
+
+        Log.info(self, "During PHP update process non nginx-cached"
+                 " parts of your site may remain down")
+
+        # Check prompt
+        if (not self.app.pargs.no_prompt):
+            start_upgrade = input("Do you want to continue:[y/N]")
+            if start_upgrade != "Y" and start_upgrade != "y":
+                Log.error(self, "Not starting PHP package update")
+
+        if EEVariables.ee_platform_distro == "Ubuntu":
+            EERepo.remove(self, ppa="ppa:ondrej/php5")
+            EERepo.add(self, ppa=EEVariables.ee_php_repo)
+        else:
+            EEAptGet.remove(self, ["php5-xdebug"])
+            EEFileUtils.searchreplace(self, EEVariables.ee_repo_file_path,
+                                      "php55", "php56")
+
+        Log.info(self, "Updating apt-cache, please wait...")
+        EEAptGet.update(self)
+        Log.info(self, "Installing packages, please wait ...")
+        EEAptGet.install(self, EEVariables.ee_php)
+
+        if EEVariables.ee_platform_distro == "debian":
+            EEShellExec.cmd_exec(self, "pecl install xdebug")
+
+            with open("/etc/php5/mods-available/xdebug.ini",
+                      encoding='utf-8', mode='a') as myfile:
+                myfile.write(";zend_extension=/usr/lib/php5/20131226/"
+                             "xdebug.so\n")
+
+            EEFileUtils.create_symlink(self, ["/etc/php5/mods-available/"
+                                       "xdebug.ini", "/etc/php5/fpm/conf.d"
+                                                     "/20-xedbug.ini"])
+
+        Log.info(self, "Successfully upgraded from PHP 5.5 to PHP 5.6")
+
+    @expose(hide=True)
+    def default(self):
+        # All package update
+        if ((not self.app.pargs.php56)):
+
+            apt_packages = []
+
+            Log.info(self, "During package update process non nginx-cached"
+                     " parts of your site may remain down")
+            # Check prompt
+            if (not self.app.pargs.no_prompt):
+                start_upgrade = input("Do you want to continue:[y/N]")
+                if start_upgrade != "Y" and start_upgrade != "y":
+                    Log.error(self, "Not starting package update")
+
+            if ((not self.app.pargs.web) and (not self.app.pargs.nginx) and
+               (not self.app.pargs.php) and (not self.app.pargs.mysql) and
+               (not self.app.pargs.postfix) and (not self.app.pargs.hhvm) and
+               (not self.app.pargs.mailscanner) and (not self.app.pargs.all)):
+                self.app.pargs.web = True
+
+            if self.app.pargs.all:
+                self.app.pargs.web = True
+                self.app.pargs.mail = True
+
+            if self.app.pargs.web:
+                self.app.pargs.nginx = True
+                self.app.pargs.php = True
+                self.app.pargs.mysql = True
+                self.app.pargs.postfix = True
+                self.app.pargs.hhvm = True
+
+            if self.app.pargs.mail:
+                self.app.pargs.nginx = True
+                self.app.pargs.php = True
+                self.app.pargs.mysql = True
+                self.app.pargs.postfix = True
+
+                if EEAptGet.is_installed(self, 'dovecot-core'):
+                    apt_packages = apt_packages + EEVariables.ee_mail
+                    self.app.pargs.mailscanner = True
+                else:
+                    Log.info(self, "Mail server is not installed")
+
+            if self.app.pargs.nginx:
+                if EEVariables.ee_platform_distro == 'debian':
+                    check_nginx = 'nginx-extras'
+                else:
+                    check_nginx = 'nginx-custom'
+
+                if EEAptGet.is_installed(self, check_nginx):
+                    apt_packages = apt_packages + EEVariables.ee_nginx
+                else:
+                    Log.info(self, "Nginx is not already installed")
+
+            if self.app.pargs.php:
+                if EEAptGet.is_installed(self, 'php5-fpm'):
+                    apt_packages = apt_packages + EEVariables.ee_php
+                else:
+                    Log.info(self, "PHP is not installed")
+
+            if self.app.pargs.hhvm:
+                if EEAptGet.is_installed(self, 'hhvm'):
+                    apt_packages = apt_packages + EEVariables.ee_hhvm
+                else:
+                    Log.info(self, "HHVM is not installed")
+
+            if self.app.pargs.mysql:
+                if EEAptGet.is_installed(self, 'mariadb-server'):
+                    apt_packages = apt_packages + EEVariables.ee_mysql
+                else:
+                    Log.info(self, "MySQL is not installed")
+
+            if self.app.pargs.postfix:
+                if EEAptGet.is_installed(self, 'postfix'):
+                    apt_packages = apt_packages + EEVariables.ee_postfix
+                else:
+                    Log.info(self, "Postfix is not installed")
+
+            if self.app.pargs.mailscanner:
+                if EEAptGet.is_installed(self, 'amavisd-new'):
+                    apt_packages = (apt_packages + EEVariables.ee_mailscanner)
+                else:
+                    Log.info(self, "MailScanner is not installed")
+
+            if len(apt_packages):
+                # apt-get update
+                EEAptGet.update(self)
+
+                # Update packages
+                Log.info(self, "Updating packages, please wait...")
+                EEAptGet.install(self, apt_packages)
+                Log.info(self, "Successfully updated packages")
+
+        # PHP 5.6 to 5.6
+        elif (self.app.pargs.php56):
+            self.upgrade_php56()
+        else:
+            self.app.args.print_help()

ee/core/apt_repo.py

@@ -1,6 +1,7 @@
 """EasyEngine packages repository operations"""
 from ee.core.shellexec import EEShellExec
 from ee.core.variables import EEVariables
+from ee.core.logging import Log
 import os
 
 
@@ -54,16 +55,31 @@ class EERepo():
                                            "'{ppa_name}'"
                                      .format(ppa_name=ppa))
 
-    def remove(self, ppa=None):
+    def remove(self, ppa=None, repo_url=None):
         """
         This function used to remove ppa's
         If ppa is provided adds repo file to
             /etc/apt/sources.list.d/
         command.
         """
-        EEShellExec.cmd_exec(self, "add-apt-repository -y "
+        if ppa:
-                             "--remove '{ppa_name}'"
+            EEShellExec.cmd_exec(self, "add-apt-repository -y "
-                             .format(ppa_name=repo_url))
+                                 "--remove '{ppa_name}'"
+                                 .format(ppa_name=repo_url))
+        elif repo_url:
+            repo_file_path = ("/etc/apt/sources.list.d/"
+                              + EEVariables().ee_repo_file)
+
+            try:
+                repofile = open(repo_file_path, "w+")
+                repofile.write(repofile.read().replace(repo_url, ""))
+                repofile.close()
+            except IOError as e:
+                Log.debug(self, "{0}".format(e))
+                Log.error(self, "File I/O error.")
+            except Exception as e:
+                Log.debug(self, "{0}".format(e))
+                Log.error(self, "Unable to remove repo")
 
     def add_key(self, keyids, keyserver=None):
         """

ee/core/aptget.py

@@ -32,32 +32,60 @@ class EEAptGet():
             Log.error(self, "Error while installing packages, "
                       "apt-get exited with error")
 
-    def dist_upgrade():
+    def check_upgrade(self):
         """
         Similar to `apt-get upgrade`
         """
         try:
-            apt_cache = apt.cache.Cache()
+            check_update = subprocess.Popen(['apt-get upgrade -s | grep '
-            apt_cache.update()
+                                            '\"^Inst\" | wc -l'],
-            apt_cache.open(None)
+                                            stdout=subprocess.PIPE,
-            apt_cache.upgrade(True)
+                                            shell=True).communicate()[0]
-            success = (apt_cache.commit(
+            if check_update == b'0\n':
-                       apt.progress.text.AcquireProgress(),
+                Log.error(self, "No package updates available")
-                       apt.progress.base.InstallProgress()))
+            Log.info(self, "Following package updates are available:")
-            # apt_cache.close()
+            subprocess.Popen("apt-get -s dist-upgrade | grep \"^Inst\"",
-            return success
+                             shell=True, executable="/bin/bash",
-        except AttributeError as e:
+                             stdout=sys.stdout).communicate()
-            Log.error(self, 'AttributeError: ' + str(e))
+
-        except FetchFailedException as e:
+        except Exception as e:
-            Log.debug(self, 'SystemError:  ' + str(e))
+            Log.error(self, "Unable to check for packages upgrades")
-            Log.error(self, 'Unable to Fetch update')
+
+    def dist_upgrade(self):
+        """
+        Similar to `apt-get upgrade`
+        """
+        try:
+            with open('/var/log/ee/ee.log', 'a') as f:
+                proc = subprocess.Popen("DEBIAN_FRONTEND=noninteractive "
+                                        "apt-get dist-upgrade -o "
+                                        "Dpkg::Options::=\"--force-confdef\""
+                                        " -o "
+                                        "Dpkg::Options::=\"--force-confold\""
+                                        " -y ",
+                                        shell=True, stdin=None,
+                                        stdout=f, stderr=f,
+                                        executable="/bin/bash")
+                proc.wait()
+
+            if proc.returncode == 0:
+                return True
+            else:
+                Log.error(self, "Unable to run apt-get dist_upgrade")
+        except Exception as e:
+            Log.error(self, "Error while installing packages, "
+                      "apt-get exited with error")
 
     def install(self, packages):
         all_packages = ' '.join(packages)
         try:
             with open('/var/log/ee/ee.log', 'a') as f:
-                proc = subprocess.Popen("apt-get install -o Dpkg::Options::=--"
+                proc = subprocess.Popen("DEBIAN_FRONTEND=noninteractive "
-                                        "force-confold -y {0}"
+                                        "apt-get install -o "
+                                        "Dpkg::Options::=\"--force-confdef\""
+                                        " -o "
+                                        "Dpkg::Options::=\"--force-confold\""
+                                        " -y {0}"
                                         .format(all_packages), shell=True,
                                         stdin=None, stdout=f, stderr=f,
                                         executable="/bin/bash")

ee/core/variables.py

@@ -77,14 +77,17 @@ class EEVariables():
 
     # PHP repo and packages
     if ee_platform_distro == 'Ubuntu':
-        ee_php_repo = "ppa:ondrej/php5"
+        ee_php_repo = "ppa:ondrej/php5-5.6"
     elif ee_platform_codename == 'wheezy':
-        ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php55 all"
+        ee_php_repo = ("deb http://packages.dotdeb.org {codename}-php56 all"
                        .format(codename=ee_platform_codename))
     ee_php = ["php5-fpm", "php5-curl", "php5-gd", "php5-imap",
-              "php5-mcrypt", "php5-xdebug", "php5-common", "php5-readline",
+              "php5-mcrypt", "php5-common", "php5-readline",
               "php5-mysql", "php5-cli", "php5-memcache", "php5-imagick",
-              "memcached", "graphviz"]
+              "memcached", "graphviz", "php-pear", "php5-dev"]
+
+    if ee_platform_distro == 'Ubuntu':
+        ee_php = ee_php + ["php5-xdebug"]
 
     # MySQL repo and packages
     if ee_platform_distro == 'Ubuntu':