Merge branch 'hotfix/v3.5.2'

Author: iam404

CHANGELOG.txt

@@ -1,3 +1,6 @@
+v3.5.2 - Feb 25, 2016
+- Fixed PHP package dependency (Trusty)
+
 v3.5.1 - Feb 25, 2016
 - Fixed #680
 

ee/cli/plugins/site.py

@@ -622,7 +622,7 @@ def default(self):
                     Log.info(self, Log.FAIL + "Oops Something went wrong !!")
                     Log.info(self, Log.FAIL + "Calling cleanup actions ...")
                     doCleanupAction(self, domain=ee_domain)
-                    Log.debug(self, str(e))
+                    deleteSiteInfo(self, ee_domain)
                     Log.error(self, "service nginx reload failed. "
                               "check issues with `nginx -t` command")
                     Log.error(self, "Check logs for reason "

ee/cli/plugins/site_functions.py

@@ -627,7 +627,7 @@ def sitebackup(self, data):
                          .format(data['site_name']), backup_path)
 
     if data['currsitetype'] in ['html', 'php', 'proxy', 'mysql']:
-        if (data['pagespeed'] is True or data['old_pagespeed_status'] is True) and not data['wp']:
+        if (data['pagespeed'] is True or data['old_pagespeed_status'] is True or data['php7'] is True) and not data['wp']:
             Log.info(self, "Backing up Webroot \t\t", end='')
             EEFileUtils.copyfiles(self, ee_site_webroot + '/htdocs', backup_path + '/htdocs')
             Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")
@@ -667,7 +667,7 @@ def sitebackup(self, data):
         Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]")
         # move wp-config.php/ee-config.php to backup
         if data['currsitetype'] in ['mysql', 'proxy']:
-            if (data['pagespeed'] is True or data['old_pagespeed_status'] is True) and not data['wp']:
+            if (data['pagespeed'] is True or data['old_pagespeed_status'] is True or data['php7'] is True) and not data['wp']:
                 EEFileUtils.copyfile(self, configfiles[0], backup_path)
             else:
                 EEFileUtils.mvfile(self, configfiles[0], backup_path)

ee/cli/plugins/stack.py

@@ -1883,7 +1883,12 @@ def post_pref(self, apt_packages, packages):
                     vm_config.close()
                 EEService.restart_service(self, 'dovecot')
                 EEService.reload_service(self, 'nginx')
-                EEService.reload_service(self, 'php5-fpm')
+                if EEVariables.ee_platform_codename != 'trusty':
+                    EEService.reload_service(self, 'php5-fpm')
+                else:
+                    EEService.reload_service(self, 'php5.6-fpm')
+                    if EEAptGet.is_installed(self, 'php7.0-fpm'):
+                        EEService.reload_service(self, 'php7.0-fpm')
                 self.msg = (self.msg + ["Configure ViMbAdmin:\thttps://{0}:"
                             "22222/vimbadmin".format(EEVariables.ee_fqdn)]
                             + ["Security Salt: {0}".format(vm_salt)])
@@ -1905,11 +1910,21 @@ def post_pref(self, apt_packages, packages):
                             '{0}roundcubemail/htdocs'
                             .format(EEVariables.ee_webroot))
 
+                #Fix pear install config for trusty
+                if EEVariables.ee_platform_codename == 'trusty':
+                    EEShellExec.cmd_exec(self, "pear config-set php_dir /usr/share/php")
+                    EEShellExec.cmd_exec(self, "pear config-set doc_dir /lib/php/pear/docs")
+                    EEShellExec.cmd_exec(self, "pear config-set cfg_dir /lib/php/pear/cfg")
+                    EEShellExec.cmd_exec(self, "pear config-set data_dir /lib/php/pear/data")
+                    EEShellExec.cmd_exec(self, "pear config-set test_dir /lib/php/pear/tests")
+                    EEShellExec.cmd_exec(self, "pear config-set www_dir /lib/php/pear/www")
                 # Install Roundcube depednet pear packages
                 EEShellExec.cmd_exec(self, "pear install Mail_Mime Net_SMTP"
                                      " Mail_mimeDecode Net_IDNA2-beta "
                                      "Auth_SASL Net_Sieve Crypt_GPG")
 
+               # pear install Mail_Mime Net_SMTP Mail_mimeDecode Net_IDNA2-beta Auth_SASL Net_Sieve Crypt_GPG
+
                 # Configure roundcube database
                 rc_passwd = ''.join(random.sample(string.ascii_letters, 8))
                 Log.debug(self, "Creating Database roundcubemail")

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.5.1"
+    ee_version = "3.5.2"
 
 
     # EasyEngine packages versions
@@ -121,12 +121,14 @@ class EEVariables():
         elif ee_platform_codename == 'trusty':
             ee_php_repo = "ppa:ondrej/php"
             ee_php5_6 = ["php5.6-fpm", "php5.6-curl", "php5.6-gd", "php5.6-imap",
-                        "php5.6-mcrypt", "php5.6-readline", "php5.6-common",
-                        "php5.6-mysql", "php5.6-cli", "php5.6-zip", "php5.6-xml"]
+                        "php5.6-mcrypt", "php5.6-readline", "php5.6-common", "php5.6-recode",
+                        "php5.6-mysql", "php5.6-cli", "php5.6-curl", "php5.6-mbstring",
+                         "php5.6-bcmath", "php5.6-mysql", "php5.6-opcache", "php5.6-zip", "php5.6-xml"]
             ee_php7_0 = ["php7.0-fpm", "php7.0-curl", "php7.0-gd", "php7.0-imap",
-                          "php7.0-mcrypt", "php7.0-readline", "php7.0-common",
-                          "php7.0-mysql", "php7.0-cli", "php7.0-zip", "php7.0-xml"]
-            ee_php_extra = ["php-memcached", "php-imagick", "memcached",
+                          "php7.0-mcrypt", "php7.0-readline", "php7.0-common", "php7.0-recode",
+                          "php7.0-mysql", "php7.0-cli", "php7.0-curl", "php7.0-mbstring",
+                         "php7.0-bcmath", "php7.0-mysql", "php7.0-opcache", "php7.0-zip", "php7.0-xml"]
+            ee_php_extra = ["php-memcached", "php-imagick", "php-memcache", "memcached",
                             "graphviz", "php-pear", "php-xdebug", "php-msgpack"]
     elif ee_platform_distro == 'debian':
         if ee_platform_codename == 'wheezy':
@@ -162,11 +164,16 @@ class EEVariables():
     # Mail repo and packages
     ee_mail_repo = ("deb http://http.debian.net/debian-backports {codename}"
                     "-backports main".format(codename=ee_platform_codename))
-
-    ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d",
-               "dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve",
-               "dovecot-managesieved", "postfix-mysql", "php5-cgi",
-               "php-gettext", "php-pear"]
+    if ee_platform_codename != 'trusty':
+        ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d",
+                 "dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve",
+                "dovecot-managesieved", "postfix-mysql", "php5-cgi",
+                "php-gettext", "php-pear"]
+    else:
+        ee_mail = ["dovecot-core", "dovecot-imapd", "dovecot-pop3d",
+                 "dovecot-lmtpd", "dovecot-mysql", "dovecot-sieve",
+                "dovecot-managesieved", "postfix-mysql", "php5.6-cgi",
+                "php-gettext", "php-pear", "subversion"]
 
     # Mailscanner repo and packages
     ee_mailscanner_repo = ()

install

@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.5.1"
+readonly ee_version_new="3.5.2"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')
@@ -304,7 +304,7 @@ function ee_upgrade_php(){
             add-apt-repository -y 'ppa:ondrej/php'
             ee_lib_echo "Upgrading required packages, please wait..."
             apt-get update &>> /dev/null
-            apt-get -y install php5.6-fpm php5.6-curl php5.6-gd php5.6-imap php5.6-mcrypt php5.6-readline php5.6-mysql php5.6-cli php5.6-common php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
+            apt-get -y install php5.6-fpm php5.6-curl php5.6-gd php5.6-imap php5.6-mcrypt php5.6-readline php5.6-mysql php5.6-cli php5.6-common php5.6-curl php5.6-mbstring php5.6-bcmath php5.6-recode php5.6-mysql php5.6-opcache php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack php5.6-zip php5.6-xml php-memcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
             if [ -e /etc/php5/fpm/pool.d/www.conf -a -e /etc/php5/fpm/pool.d/debug.conf -a -e /etc/php5/fpm/php.ini -a -e /etc/php5/fpm/php-fpm.conf ]; then
                 cp -f /etc/php5/fpm/pool.d/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null
                 cp -f /etc/php5/fpm/pool.d/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null
@@ -325,10 +325,17 @@ function ee_upgrade_php(){
             rm -f /etc/apt/sources.list.d/ondrej-php5-5_6-trusty.list &>> /dev/null
             apt-get remove -y php5-fpm php5-curl php5-gd php5-imap php5-mcrypt php5-common php5-readline php5-mysql php5-cli php5-memcache php5-imagick memcached graphviz php-pear
 
+          #Fix for PHP 5.6 + 7.0 missed packages
         elif [ -f /etc/apt/sources.list.d/ondrej-php-trusty.list ]; then
-            apt-get -y install php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
+            apt-get -y install php5.6-zip php5.6-xml php5.6-curl php5.6-mbstring php5.6-recode php5.6-bcmath php5.6-mysql php5.6-opcache php-memcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
+            dpkg-query -W -f='${Status} ${Version}\n' php7.0-fpm 2>/dev/null | grep installed
+            if [ "$?" -eq "0" ]; then
+                apt-get -y install php7.0-zip php7.0-xml php7.0-curl php7.0-mbstring php7.0-recode php7.0-bcmath php7.0-mysql php7.0-opcache php-memcache || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
+                service php7.0-fpm restart &>> /dev/null
+            fi
+            service php5.6-fpm restart &>> /dev/null
         fi
-    fi
+   fi
 
 }
 

setup.py

@@ -58,7 +58,7 @@
       shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
 
 setup(name='ee',
-      version='3.5.1',
+      version='3.5.2',
       description=long_description,
       long_description=long_description,
       classifiers=[],