From 0212088b12ea854f4707ca6f76ddd297d1d58cac Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 2 Mar 2016 19:03:38 +0530 Subject: [PATCH 01/17] Get my.cnf path on "ee info --mysql" #482 --- ee/cli/templates/info_mysql.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/ee/cli/templates/info_mysql.mustache b/ee/cli/templates/info_mysql.mustache index 29a5d81e..0b249dc0 100644 --- a/ee/cli/templates/info_mysql.mustache +++ b/ee/cli/templates/info_mysql.mustache @@ -7,3 +7,4 @@ interactive_timeout {{interactive_timeout}} max_used_connections {{max_used_connections}} datadir {{datadir}} socket {{socket}} +my.cnf [PATH] /etc/mysql/conf.d/my.cnf From 63437764fb45dc321234f9c78daa918d1e456154 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 2 Mar 2016 19:04:09 +0530 Subject: [PATCH 02/17] changed debug file path --- ee/cli/plugins/debug.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/cli/plugins/debug.py b/ee/cli/plugins/debug.py index dfc9ebe0..e9757550 100644 --- a/ee/cli/plugins/debug.py +++ b/ee/cli/plugins/debug.py @@ -194,7 +194,7 @@ class EEDebugController(CementBaseController): nc.savef('/etc/nginx/conf.d/upstream.conf') # Enable xdebug - EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php" if EEVariables.ee_platform_codename == 'trusty' else "php5") + + EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php/5.6" if EEVariables.ee_platform_codename == 'trusty' else "php5") + "xdebug.ini", ";zend_extension", "zend_extension") @@ -233,7 +233,7 @@ class EEDebugController(CementBaseController): nc.savef('/etc/nginx/conf.d/upstream.conf') # Disable xdebug - EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php" if EEVariables.ee_platform_codename == 'trusty' else "php5") + + EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php/5.6" if EEVariables.ee_platform_codename == 'trusty' else "php5") + "xdebug.ini", "zend_extension", ";zend_extension") @@ -311,7 +311,7 @@ class EEDebugController(CementBaseController): nc.savef('/etc/nginx/conf.d/upstream.conf') # Enable xdebug - EEFileUtils.searchreplace(self, "/etc/php/mods-available/" + EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/" "xdebug.ini", ";zend_extension", "zend_extension") @@ -350,7 +350,7 @@ class EEDebugController(CementBaseController): nc.savef('/etc/nginx/conf.d/upstream.conf') # Disable xdebug - EEFileUtils.searchreplace(self, "/etc/php/mods-available/" + EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/" "xdebug.ini", "zend_extension", ";zend_extension") From 5ae7201680fa04c0cf7aa0ddae158b5fdf37fcf9 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 2 Mar 2016 19:47:24 +0530 Subject: [PATCH 03/17] Fix ondrej fixxing --- install | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/install b/install index 4e9a5bd8..9279ee16 100644 --- a/install +++ b/install @@ -326,14 +326,38 @@ function ee_upgrade_php(){ 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 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 + elif [ -f /etc/php/mods-available/readline.ini ]; then + mkdir -p /tmp/php-conf/5.6 + mkdir -p /tmp/php-conf/7.0 + cp -f /etc/php/5.6/fpm/pool.d/www.conf /tmp/php-conf/5.6 &>> /dev/null + cp -f /etc/php/5.6/fpm/pool.d/debug.conf /tmp/php-conf/5.6 &>> /dev/null + cp -f /etc/php/5.6/fpm/php.ini /tmp/php-conf/5.6 &>> /dev/null + cp -f /etc/php/5.6/fpm/php-fpm.conf /tmp/php-conf/5.6 &>> /dev/null + + cp -f /etc/php/7.0/fpm/pool.d/www.conf /tmp/php-conf/7.0 &>> /dev/null + cp -f /etc/php/7.0/fpm/pool.d/debug.conf /tmp/php-conf/7.0 &>> /dev/null + cp -f /etc/php/7.0/fpm/php.ini /tmp/php-conf/7.0 &>> /dev/null + cp -f /etc/php/7.0/fpm/php-fpm.conf /tmp/php-conf/7.0 &>> /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 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 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 + apt-get -y install php7.0-fpm php7.0-curl php7.0-gd php7.0-imap 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 php-memcached php-imagick php-memcache memcached graphviz php-pear php-xdebug php-msgpack || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 + mv -f /tmp/php-conf/7.0/www.conf /etc/php/7.0/fpm/pool.d/www.conf &>> /dev/null + mv -f /tmp/php-conf/7.0/debug.conf /etc/php/7.0/fpm/pool.d/debug.conf &>> /dev/null + mv -f /tmp/php-conf/7.0/php.ini /etc/php/7.0/fpm/php.ini &>> /dev/null + mv -f /tmp/php-conf/7.0/php-fpm.conf /etc/php/7.0/fpm/php-fpm.conf &>> /dev/null service php7.0-fpm restart &>> /dev/null fi + + mv -f /tmp/php-conf/5.6/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null + mv -f /tmp/php-conf/5.6/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null + mv -f /tmp/php-conf/5.6/php.ini /etc/php/5.6/fpm/php.ini &>> /dev/null + mv -f /tmp/php-conf/5.6/php-fpm.conf /etc/php/5.6/fpm/php-fpm.conf &>> /dev/null + service php5.6-fpm restart &>> /dev/null + rm -rf /tmp/php-conf fi fi From 61c6285451876c032206c5e4f2a78db070fa0f51 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 3 Mar 2016 10:56:49 +0530 Subject: [PATCH 04/17] update mysql mustache --- ee/cli/templates/info_mysql.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/cli/templates/info_mysql.mustache b/ee/cli/templates/info_mysql.mustache index 0b249dc0..8d7ac950 100644 --- a/ee/cli/templates/info_mysql.mustache +++ b/ee/cli/templates/info_mysql.mustache @@ -7,4 +7,4 @@ interactive_timeout {{interactive_timeout}} max_used_connections {{max_used_connections}} datadir {{datadir}} socket {{socket}} -my.cnf [PATH] /etc/mysql/conf.d/my.cnf +my.cnf [PATH] /etc/mysql/conf.d/my.cnf From 9ab61a94e7a6056f93f76b5f019346bb8f4863d2 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 3 Mar 2016 10:57:24 +0530 Subject: [PATCH 05/17] install php5.6 with php7.0 --- ee/cli/plugins/site_functions.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 6364ea4d..81fc539e 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -723,11 +723,15 @@ def site_package_check(self, stype): 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 + EEVariables.ee_php_extra + Log.debug(self, "Setting apt_packages variable for PHP 5.6") + if not EEAptGet.is_installed(self, 'php5.6-fpm'): + apt_packages = apt_packages + EEVariables.ee_php5_6 + 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 5.0") - Log.debug(self, "Setting apt_packages variable for PHP 5.0") + 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 stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']: From 8c1517ce8dc15b98d87f3d48df37b2dfb3f438d0 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 3 Mar 2016 12:01:01 +0530 Subject: [PATCH 06/17] php 5.6 + php7 --- ee/cli/plugins/site_functions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 81fc539e..a896b7ee 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -720,12 +720,12 @@ def site_package_check(self, stype): if self.app.pargs.php7 and stype in [ 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']: if EEVariables.ee_platform_codename == 'trusty': - 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 + EEVariables.ee_php_extra Log.debug(self, "Setting apt_packages variable for PHP 5.6") if not EEAptGet.is_installed(self, 'php5.6-fpm'): apt_packages = apt_packages + EEVariables.ee_php5_6 + EEVariables.ee_php_extra + 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 + 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") From c143f26e3a18feda571974a384dbd6fe42f751ab Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 3 Mar 2016 18:34:42 +0530 Subject: [PATCH 07/17] Fix try --- ee/cli/plugins/site_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index a896b7ee..5af99f7b 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -722,7 +722,7 @@ def site_package_check(self, stype): if EEVariables.ee_platform_codename == 'trusty': Log.debug(self, "Setting apt_packages variable for PHP 5.6") if not EEAptGet.is_installed(self, 'php5.6-fpm'): - apt_packages = apt_packages + EEVariables.ee_php5_6 + EEVariables.ee_php_extra + apt_packages = apt_packages + EEVariables.ee_php5_6 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 + EEVariables.ee_php_extra From dab5fba9cf6763575e3e3d4c7f9e108324b9af22 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 7 Mar 2016 14:56:55 +0530 Subject: [PATCH 08/17] restore missing php 5.6 packages when php 7.0 purged --- ee/cli/plugins/stack.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 6fb582ad..9979e8ea 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2578,6 +2578,13 @@ class EEStackController(CementBaseController): Log.info(self, "Successfully removed packages") + if self.app.pargs.php7: + if not EEAptGet.is_installed(self, 'php5.6-fpm'): + Log.info(self, "PHP5.6-fpm found on system.") + Log.info(self, "Verifying and installing missing packages,") + EEShellExec.cmd_exec(self, "apt-get install -y php-memcached php-igbinary") + + @expose(help="Purge packages") def purge(self): """Start purging of packages""" @@ -2740,6 +2747,14 @@ class EEStackController(CementBaseController): Log.info(self, "Successfully purged packages") + if self.app.pargs.php7: + if not EEAptGet.is_installed(self, 'php5.6-fpm'): + Log.info(self, "PHP5.6-fpm found on system.") + Log.info(self, "Verifying and installing missing packages,") + EEShellExec.cmd_exec(self, "apt-get install -y php-memcached php-igbinary") + + + def load(app): # register the plugin class.. this only happens if the plugin is enabled handler.register(EEStackController) From 8b95c9353bb4afdb5642a157da0ea4fb53189a5f Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 7 Mar 2016 15:49:10 +0530 Subject: [PATCH 09/17] Fix http://goo.gl/ptyJZ3 --- ee/core/variables.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/core/variables.py b/ee/core/variables.py index b3242381..25d589f8 100644 --- a/ee/core/variables.py +++ b/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-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"] + "php5.6-bcmath", "php5.6-mysql", "php5.6-opcache", "php5.6-zip", "php5.6-xml", "php5.6-soap"] 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-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"] + "php7.0-bcmath", "php7.0-mysql", "php7.0-opcache", "php7.0-zip", "php7.0-xml", "php7.0-soap"] ee_php_extra = ["php-memcached", "php-imagick", "php-memcache", "memcached", "graphviz", "php-pear", "php-xdebug", "php-msgpack"] elif ee_platform_distro == 'debian': From 288ccd8f9df16e3eb13af0dd5b9f18a34882101a Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 7 Mar 2016 16:02:26 +0530 Subject: [PATCH 10/17] Added soap in install script --- install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install b/install index 9279ee16..05db6021 100644 --- a/install +++ b/install @@ -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 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 + 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 php5.6-soap 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 @@ -343,7 +343,7 @@ function ee_upgrade_php(){ 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 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-fpm php7.0-curl php7.0-gd php7.0-imap 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 php-memcached php-imagick php-memcache memcached graphviz php-pear php-xdebug php-msgpack || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1 + apt-get -y install php7.0-fpm php7.0-curl php7.0-gd php7.0-imap 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 php-memcached php-imagick php-memcache memcached graphviz php-pear php-xdebug php-msgpack php7.0-soap || ee_lib_error "Unable to install PHP 7.0 packages, exit status " 1 mv -f /tmp/php-conf/7.0/www.conf /etc/php/7.0/fpm/pool.d/www.conf &>> /dev/null mv -f /tmp/php-conf/7.0/debug.conf /etc/php/7.0/fpm/pool.d/debug.conf &>> /dev/null mv -f /tmp/php-conf/7.0/php.ini /etc/php/7.0/fpm/php.ini &>> /dev/null From 6c6e06f16f510d1ceabf3311744c9709962774e7 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 8 Mar 2016 12:49:52 +0530 Subject: [PATCH 11/17] Fix vimbadmin installation issue --- ee/cli/plugins/stack.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 9979e8ea..dba8d09b 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2105,9 +2105,24 @@ class EEStackController(CementBaseController): os.popen("hostname -f | tr -d '\n'").read()) Log.debug(self, "Setting apt_packages variable for mail") apt_packages = apt_packages + EEVariables.ee_mail - packages = packages + [["https://github.com/opensolutions/" - "ViMbAdmin/archive/{0}.tar.gz" - .format(EEVariables.ee_vimbadmin), + + #Backup before changing repo to private + # packages = packages + [["https://github.com/opensolutions/" + # "ViMbAdmin/archive/{0}.tar.gz" + # .format(EEVariables.ee_vimbadmin), + # "/tmp/vimbadmin.tar.gz", + # "ViMbAdmin"], + # ["https://github.com/roundcube/" + # "roundcubemail/releases/download/" + # "{0}/roundcubemail-{0}.tar.gz" + # .format(EEVariables.ee_roundcube), + # "/tmp/roundcube.tar.gz", + # "Roundcube"]] + + +#https://github.com/iam404/ViMbAdmin/archive/3.0.13.tar.gz + packages = packages + [["https://github.com/iam404/" + "ViMbAdmin/archive/3.0.13.tar.gz", "/tmp/vimbadmin.tar.gz", "ViMbAdmin"], ["https://github.com/roundcube/" From 576722144c370f4c3b783595bd3e4d88687abcf1 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 8 Mar 2016 13:08:23 +0530 Subject: [PATCH 12/17] vimbadmin test repo --- ee/cli/plugins/stack.py | 3 ++- ee/core/variables.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index dba8d09b..7e355ab8 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2122,7 +2122,8 @@ class EEStackController(CementBaseController): #https://github.com/iam404/ViMbAdmin/archive/3.0.13.tar.gz packages = packages + [["https://github.com/iam404/" - "ViMbAdmin/archive/3.0.13.tar.gz", + "ViMbAdmin/archive/{0}.tar.gz" + .format(EEVariables.ee_vimbadmin), "/tmp/vimbadmin.tar.gz", "ViMbAdmin"], ["https://github.com/roundcube/" diff --git a/ee/core/variables.py b/ee/core/variables.py index 25d589f8..1ff9cfb2 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -19,7 +19,8 @@ class EEVariables(): ee_wp_cli = "0.22.0" ee_adminer = "4.2.1" ee_roundcube = "1.1.4" - ee_vimbadmin = "3.0.12" + # ee_vimbadmin = "3.0.12" + ee_vimbadmin = "3.0.13" # Get WPCLI path ee_wpcli_path = os.popen('which wp | tr "\n" " "').read() From d8a048ce695c9cbfa942ff66536e96d149a517d6 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 14 Mar 2016 14:07:37 +0530 Subject: [PATCH 13/17] changed vimbadmin repo --- ee/cli/plugins/stack.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 7e355ab8..c735d4bf 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2120,10 +2120,9 @@ class EEStackController(CementBaseController): # "Roundcube"]] -#https://github.com/iam404/ViMbAdmin/archive/3.0.13.tar.gz - packages = packages + [["https://github.com/iam404/" - "ViMbAdmin/archive/{0}.tar.gz" - .format(EEVariables.ee_vimbadmin), + # https://github.com/EasyEngine/ViMbAdmin/archive/3.0.13.tar.gz + packages = packages + [["https://github.com/EasyEngine/" + "ViMbAdmin/archive/master.tar.gz" "/tmp/vimbadmin.tar.gz", "ViMbAdmin"], ["https://github.com/roundcube/" From 4bdc8566fff7c4a64ab52c6657e1344447e73e3b Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 14 Mar 2016 14:09:45 +0530 Subject: [PATCH 14/17] changed vimbadmin repo --- ee/cli/plugins/stack.py | 3 ++- ee/core/variables.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index c735d4bf..e27ed149 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2122,7 +2122,8 @@ class EEStackController(CementBaseController): # https://github.com/EasyEngine/ViMbAdmin/archive/3.0.13.tar.gz packages = packages + [["https://github.com/EasyEngine/" - "ViMbAdmin/archive/master.tar.gz" + "ViMbAdmin/archive/{0}.tar.gz" + .format(EEVariables.ee_vimbadmin), "/tmp/vimbadmin.tar.gz", "ViMbAdmin"], ["https://github.com/roundcube/" diff --git a/ee/core/variables.py b/ee/core/variables.py index 1ff9cfb2..119ecbfd 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -20,7 +20,7 @@ class EEVariables(): ee_adminer = "4.2.1" ee_roundcube = "1.1.4" # ee_vimbadmin = "3.0.12" - ee_vimbadmin = "3.0.13" + ee_vimbadmin = "master" # Get WPCLI path ee_wpcli_path = os.popen('which wp | tr "\n" " "').read() From d474e15f040ea9e0272424a47c6bb9c4a3b4677a Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Mon, 14 Mar 2016 17:00:24 +0530 Subject: [PATCH 15/17] Temporary fix for ondrej php purging issue --- ee/cli/plugins/stack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index e27ed149..7f1c1e56 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -2595,7 +2595,7 @@ class EEStackController(CementBaseController): Log.info(self, "Successfully removed packages") if self.app.pargs.php7: - if not EEAptGet.is_installed(self, 'php5.6-fpm'): + if EEAptGet.is_installed(self, 'php5.6-fpm'): Log.info(self, "PHP5.6-fpm found on system.") Log.info(self, "Verifying and installing missing packages,") EEShellExec.cmd_exec(self, "apt-get install -y php-memcached php-igbinary") @@ -2764,7 +2764,7 @@ class EEStackController(CementBaseController): Log.info(self, "Successfully purged packages") if self.app.pargs.php7: - if not EEAptGet.is_installed(self, 'php5.6-fpm'): + if EEAptGet.is_installed(self, 'php5.6-fpm'): Log.info(self, "PHP5.6-fpm found on system.") Log.info(self, "Verifying and installing missing packages,") EEShellExec.cmd_exec(self, "apt-get install -y php-memcached php-igbinary") From 441f9bc8bfe05eb5d21b3b9598315730145e6672 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 15 Mar 2016 12:25:52 +0530 Subject: [PATCH 16/17] Update version --- ee/core/variables.py | 2 +- install | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ee/core/variables.py b/ee/core/variables.py index 119ecbfd..623cda31 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -12,7 +12,7 @@ class EEVariables(): """Intialization of core variables""" # EasyEngine version - ee_version = "3.5.3" + ee_version = "3.5.4" # EasyEngine packages versions diff --git a/install b/install index 05db6021..80a0f990 100644 --- a/install +++ b/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.3" +readonly ee_version_new="3.5.4" 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}') diff --git a/setup.py b/setup.py index b71e92cd..8201b41b 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ if not os.path.isfile('/root/.gitconfig'): shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') setup(name='ee', - version='3.5.3', + version='3.5.4', description=long_description, long_description=long_description, classifiers=[], From b2970b9dd0ba595360ea79dc1db9f85c99df8898 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 15 Mar 2016 14:11:05 +0530 Subject: [PATCH 17/17] Update CHANGELOG --- CHANGELOG.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 143f6006..76f79c3f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +v3.5.4 - Mar 15, 2016 +- Fixed Vimbadmin installation issue +- PR #684 +- Minor fixes + v3.5.3 - Feb 25, 2016 - Fixed #650 - Fixed #681