lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'hotfix/v3.5.4'

master v3.5.4
Prabuddha Chakraborty 9 years ago
parent
015b0d66e8 b2970b9dd0
commit
86b49992bb
8 changed files with 84 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      CHANGELOG.txt
  2. 8
      ee/cli/plugins/debug.py
  3. 8
      ee/cli/plugins/site_functions.py
  4. 33
      ee/cli/plugins/stack.py
  5. 1
      ee/cli/templates/info_mysql.mustache
  6. 9
      ee/core/variables.py
  7. 34
      install
  8. 2
      setup.py

5
CHANGELOG.txt
View File

@ -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

8
ee/cli/plugins/debug.py
View File

@ -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")

8
ee/cli/plugins/site_functions.py
View File

@ -720,14 +720,18 @@ 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 5.6")
if not EEAptGet.is_installed(self, 'php5.6-fpm'):
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
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']:

33
ee/cli/plugins/stack.py
View File

@ -2105,7 +2105,23 @@ 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/"
#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/EasyEngine/ViMbAdmin/archive/3.0.13.tar.gz
packages = packages + [["https://github.com/EasyEngine/"
"ViMbAdmin/archive/{0}.tar.gz"
.format(EEVariables.ee_vimbadmin),
"/tmp/vimbadmin.tar.gz",
@ -2578,6 +2594,13 @@ class EEStackController(CementBaseController):
Log.info(self, "Successfully removed packages")
if self.app.pargs.php7:
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")
@expose(help="Purge packages")
def purge(self):
"""Start purging of packages"""
@ -2740,6 +2763,14 @@ class EEStackController(CementBaseController):
Log.info(self, "Successfully purged packages")
if self.app.pargs.php7:
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")
def load(app):
# register the plugin class.. this only happens if the plugin is enabled
handler.register(EEStackController)

1
ee/cli/templates/info_mysql.mustache
View File

@ -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

9
ee/core/variables.py
View File

@ -12,14 +12,15 @@ class EEVariables():
"""Intialization of core variables"""
# EasyEngine version
ee_version = "3.5.3"
ee_version = "3.5.4"
# EasyEngine packages versions
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 = "master"
# Get WPCLI path
ee_wpcli_path = os.popen('which wp | tr "\n" " "').read()
@ -123,11 +124,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':

34
install
View File

@ -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}')
@ -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
@ -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 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
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

2
setup.py
View File

@ -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=[],

Write Preview
Loading…
Cancel
Save