Skip to content

Commit 86b4999

Browse files
iam404iam404
committed
Merge branch 'hotfix/v3.5.4'
2 parents 015b0d6 + b2970b9 commit 86b4999

File tree

8 files changed

+84
-18
lines changed

8 files changed

+84
-18
lines changed

‎CHANGELOG.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v3.5.4 - Mar 15, 2016
2+
- Fixed Vimbadmin installation issue
3+
- PR #684
4+
- Minor fixes
5+
16
v3.5.3 - Feb 25, 2016
27
- Fixed #650
38
- Fixed #681

‎ee/cli/plugins/debug.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def debug_php(self):
194194
nc.savef('/etc/nginx/conf.d/upstream.conf')
195195

196196
# Enable xdebug
197-
EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php" if EEVariables.ee_platform_codename == 'trusty' else "php5") +
197+
EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php/5.6" if EEVariables.ee_platform_codename == 'trusty' else "php5") +
198198
"xdebug.ini",
199199
";zend_extension",
200200
"zend_extension")
@@ -233,7 +233,7 @@ def debug_php(self):
233233
nc.savef('/etc/nginx/conf.d/upstream.conf')
234234

235235
# Disable xdebug
236-
EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php" if EEVariables.ee_platform_codename == 'trusty' else "php5") +
236+
EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php/5.6" if EEVariables.ee_platform_codename == 'trusty' else "php5") +
237237
"xdebug.ini",
238238
"zend_extension",
239239
";zend_extension")
@@ -311,7 +311,7 @@ def debug_php7(self):
311311
nc.savef('/etc/nginx/conf.d/upstream.conf')
312312

313313
# Enable xdebug
314-
EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
314+
EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
315315
"xdebug.ini",
316316
";zend_extension",
317317
"zend_extension")
@@ -350,7 +350,7 @@ def debug_php7(self):
350350
nc.savef('/etc/nginx/conf.d/upstream.conf')
351351

352352
# Disable xdebug
353-
EEFileUtils.searchreplace(self, "/etc/php/mods-available/"
353+
EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/"
354354
"xdebug.ini",
355355
"zend_extension",
356356
";zend_extension")

‎ee/cli/plugins/site_functions.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -720,14 +720,18 @@ def site_package_check(self, stype):
720720

721721
if self.app.pargs.php7 and stype in [ 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
722722
if EEVariables.ee_platform_codename == 'trusty':
723+
Log.debug(self, "Setting apt_packages variable for PHP 5.6")
724+
if not EEAptGet.is_installed(self, 'php5.6-fpm'):
725+
apt_packages = apt_packages + EEVariables.ee_php5_6
723726
Log.debug(self, "Setting apt_packages variable for PHP 7.0")
724727
if not EEAptGet.is_installed(self, 'php7.0-fpm'):
725728
apt_packages = apt_packages + EEVariables.ee_php7_0 + EEVariables.ee_php_extra
726729
else:
727730
Log.warn(self, "PHP 7.0 not available for your system.")
731+
Log.info(self,"Creating site with PHP 5.6")
728732
if not EEAptGet.is_installed(self, 'php5-fpm'):
729-
Log.info(self, "Setting apt_packages variable for PHP 5.0")
730-
Log.debug(self, "Setting apt_packages variable for PHP 5.0")
733+
Log.info(self, "Setting apt_packages variable for PHP")
734+
Log.debug(self, "Setting apt_packages variable for PHP")
731735
apt_packages = apt_packages + EEVariables.ee_php
732736

733737
if stype in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']:

‎ee/cli/plugins/stack.py‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,9 +2105,25 @@ def install(self, packages=[], apt_packages=[], disp_msg=True):
21052105
os.popen("hostname -f | tr -d '\n'").read())
21062106
Log.debug(self, "Setting apt_packages variable for mail")
21072107
apt_packages = apt_packages + EEVariables.ee_mail
2108-
packages = packages + [["https://github.com/opensolutions/"
2108+
2109+
#Backup before changing repo to private
2110+
# packages = packages + [["https://github.com/opensolutions/"
2111+
# "ViMbAdmin/archive/{0}.tar.gz"
2112+
# .format(EEVariables.ee_vimbadmin),
2113+
# "/tmp/vimbadmin.tar.gz",
2114+
# "ViMbAdmin"],
2115+
# ["https://github.com/roundcube/"
2116+
# "roundcubemail/releases/download/"
2117+
# "{0}/roundcubemail-{0}.tar.gz"
2118+
# .format(EEVariables.ee_roundcube),
2119+
# "/tmp/roundcube.tar.gz",
2120+
# "Roundcube"]]
2121+
2122+
2123+
# https://github.com/EasyEngine/ViMbAdmin/archive/3.0.13.tar.gz
2124+
packages = packages + [["https://github.com/EasyEngine/"
21092125
"ViMbAdmin/archive/{0}.tar.gz"
2110-
.format(EEVariables.ee_vimbadmin),
2126+
.format(EEVariables.ee_vimbadmin),
21112127
"/tmp/vimbadmin.tar.gz",
21122128
"ViMbAdmin"],
21132129
["https://github.com/roundcube/"
@@ -2578,6 +2594,13 @@ def remove(self):
25782594

25792595
Log.info(self, "Successfully removed packages")
25802596

2597+
if self.app.pargs.php7:
2598+
if EEAptGet.is_installed(self, 'php5.6-fpm'):
2599+
Log.info(self, "PHP5.6-fpm found on system.")
2600+
Log.info(self, "Verifying and installing missing packages,")
2601+
EEShellExec.cmd_exec(self, "apt-get install -y php-memcached php-igbinary")
2602+
2603+
25812604
@expose(help="Purge packages")
25822605
def purge(self):
25832606
"""Start purging of packages"""
@@ -2740,6 +2763,14 @@ def purge(self):
27402763

27412764
Log.info(self, "Successfully purged packages")
27422765

2766+
if self.app.pargs.php7:
2767+
if EEAptGet.is_installed(self, 'php5.6-fpm'):
2768+
Log.info(self, "PHP5.6-fpm found on system.")
2769+
Log.info(self, "Verifying and installing missing packages,")
2770+
EEShellExec.cmd_exec(self, "apt-get install -y php-memcached php-igbinary")
2771+
2772+
2773+
27432774
def load(app):
27442775
# register the plugin class.. this only happens if the plugin is enabled
27452776
handler.register(EEStackController)

‎ee/cli/templates/info_mysql.mustache‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ interactive_timeout {{interactive_timeout}}
77
max_used_connections {{max_used_connections}}
88
datadir {{datadir}}
99
socket {{socket}}
10+
my.cnf [PATH] /etc/mysql/conf.d/my.cnf

‎ee/core/variables.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ class EEVariables():
1212
"""Intialization of core variables"""
1313

1414
# EasyEngine version
15-
ee_version = "3.5.3"
15+
ee_version = "3.5.4"
1616

1717

1818
# EasyEngine packages versions
1919
ee_wp_cli = "0.22.0"
2020
ee_adminer = "4.2.1"
2121
ee_roundcube = "1.1.4"
22-
ee_vimbadmin = "3.0.12"
22+
# ee_vimbadmin = "3.0.12"
23+
ee_vimbadmin = "master"
2324

2425
# Get WPCLI path
2526
ee_wpcli_path = os.popen('which wp | tr "\n" " "').read()
@@ -123,11 +124,11 @@ class EEVariables():
123124
ee_php5_6 = ["php5.6-fpm", "php5.6-curl", "php5.6-gd", "php5.6-imap",
124125
"php5.6-mcrypt", "php5.6-readline", "php5.6-common", "php5.6-recode",
125126
"php5.6-mysql", "php5.6-cli", "php5.6-curl", "php5.6-mbstring",
126-
"php5.6-bcmath", "php5.6-mysql", "php5.6-opcache", "php5.6-zip", "php5.6-xml"]
127+
"php5.6-bcmath", "php5.6-mysql", "php5.6-opcache", "php5.6-zip", "php5.6-xml", "php5.6-soap"]
127128
ee_php7_0 = ["php7.0-fpm", "php7.0-curl", "php7.0-gd", "php7.0-imap",
128129
"php7.0-mcrypt", "php7.0-readline", "php7.0-common", "php7.0-recode",
129130
"php7.0-mysql", "php7.0-cli", "php7.0-curl", "php7.0-mbstring",
130-
"php7.0-bcmath", "php7.0-mysql", "php7.0-opcache", "php7.0-zip", "php7.0-xml"]
131+
"php7.0-bcmath", "php7.0-mysql", "php7.0-opcache", "php7.0-zip", "php7.0-xml", "php7.0-soap"]
131132
ee_php_extra = ["php-memcached", "php-imagick", "php-memcache", "memcached",
132133
"graphviz", "php-pear", "php-xdebug", "php-msgpack"]
133134
elif ee_platform_distro == 'debian':

‎install‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fi
4848
# Define variables for later use
4949
ee_branch=$1
5050
readonly ee_version_old="2.2.3"
51-
readonly ee_version_new="3.5.3"
51+
readonly ee_version_new="3.5.4"
5252
readonly ee_log_dir=/var/log/ee/
5353
readonly ee_install_log=/var/log/ee/install.log
5454
readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')
@@ -304,7 +304,7 @@ function ee_upgrade_php(){
304304
add-apt-repository -y 'ppa:ondrej/php'
305305
ee_lib_echo "Upgrading required packages, please wait..."
306306
apt-get update &>> /dev/null
307-
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
307+
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
308308
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
309309
cp -f /etc/php5/fpm/pool.d/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null
310310
cp -f /etc/php5/fpm/pool.d/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null
@@ -326,14 +326,38 @@ function ee_upgrade_php(){
326326
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
327327

328328
#Fix for PHP 5.6 + 7.0 missed packages
329-
elif [ -f /etc/apt/sources.list.d/ondrej-php-trusty.list ]; then
330-
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
329+
elif [ -f /etc/php/mods-available/readline.ini ]; then
330+
mkdir -p /tmp/php-conf/5.6
331+
mkdir -p /tmp/php-conf/7.0
332+
cp -f /etc/php/5.6/fpm/pool.d/www.conf /tmp/php-conf/5.6 &>> /dev/null
333+
cp -f /etc/php/5.6/fpm/pool.d/debug.conf /tmp/php-conf/5.6 &>> /dev/null
334+
cp -f /etc/php/5.6/fpm/php.ini /tmp/php-conf/5.6 &>> /dev/null
335+
cp -f /etc/php/5.6/fpm/php-fpm.conf /tmp/php-conf/5.6 &>> /dev/null
336+
337+
cp -f /etc/php/7.0/fpm/pool.d/www.conf /tmp/php-conf/7.0 &>> /dev/null
338+
cp -f /etc/php/7.0/fpm/pool.d/debug.conf /tmp/php-conf/7.0 &>> /dev/null
339+
cp -f /etc/php/7.0/fpm/php.ini /tmp/php-conf/7.0 &>> /dev/null
340+
cp -f /etc/php/7.0/fpm/php-fpm.conf /tmp/php-conf/7.0 &>> /dev/null
341+
342+
343+
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
331344
dpkg-query -W -f='${Status} ${Version}\n' php7.0-fpm 2>/dev/null | grep installed
332345
if [ "$?" -eq "0" ]; then
333-
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
346+
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
347+
mv -f /tmp/php-conf/7.0/www.conf /etc/php/7.0/fpm/pool.d/www.conf &>> /dev/null
348+
mv -f /tmp/php-conf/7.0/debug.conf /etc/php/7.0/fpm/pool.d/debug.conf &>> /dev/null
349+
mv -f /tmp/php-conf/7.0/php.ini /etc/php/7.0/fpm/php.ini &>> /dev/null
350+
mv -f /tmp/php-conf/7.0/php-fpm.conf /etc/php/7.0/fpm/php-fpm.conf &>> /dev/null
334351
service php7.0-fpm restart &>> /dev/null
335352
fi
353+
354+
mv -f /tmp/php-conf/5.6/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null
355+
mv -f /tmp/php-conf/5.6/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null
356+
mv -f /tmp/php-conf/5.6/php.ini /etc/php/5.6/fpm/php.ini &>> /dev/null
357+
mv -f /tmp/php-conf/5.6/php-fpm.conf /etc/php/5.6/fpm/php-fpm.conf &>> /dev/null
358+
336359
service php5.6-fpm restart &>> /dev/null
360+
rm -rf /tmp/php-conf
337361
fi
338362
fi
339363

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
5959

6060
setup(name='ee',
61-
version='3.5.3',
61+
version='3.5.4',
6262
description=long_description,
6363
long_description=long_description,
6464
classifiers=[],

0 commit comments

Comments
 (0)