Browse Source

Merge branch 'hotfix/v3.5.5'

master v3.5.5
Prabuddha Chakraborty 9 years ago
parent
commit
73ee53d7a4
  1. 6
      CHANGELOG.txt
  2. 7
      ee/cli/plugins/site.py
  3. 4
      ee/cli/plugins/site_functions.py
  4. 2
      ee/core/variables.py
  5. 2
      install
  6. 2
      setup.py

6
CHANGELOG.txt

@ -1,3 +1,9 @@
v3.5.5 - Apr 13, 2016
- WP-CLI support for wordpress v4.5, PR #701
- PR #686
- Fix #702
- Minor Fixes
v3.5.4 - Mar 15, 2016 v3.5.4 - Mar 15, 2016
- Fixed Vimbadmin installation issue - Fixed Vimbadmin installation issue
- PR #684 - PR #684

7
ee/cli/plugins/site.py

@ -1213,6 +1213,13 @@ class EESiteUpdateController(CementBaseController):
Log.info(self,"SSL not configured for site http://{0}".format(ee_domain)) Log.info(self,"SSL not configured for site http://{0}".format(ee_domain))
return 0 return 0
if pargs.all and pargs.letsencrypt == "off":
if letsencrypt is check_ssl:
if letsencrypt is False:
Log.error(self, "SSl is not configured for given "
"site",False)
return 0
if pargs.letsencrypt: if pargs.letsencrypt:
if pargs.letsencrypt == 'on': if pargs.letsencrypt == 'on':
data['letsencrypt'] = True data['letsencrypt'] = True

4
ee/cli/plugins/site_functions.py

@ -1417,7 +1417,7 @@ def renewLetsEncrypt(self, ee_domain_name):
Log.info(self, "Renewing SSl cert for https://{0}".format(ee_domain_name)) Log.info(self, "Renewing SSl cert for https://{0}".format(ee_domain_name))
ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} " ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew-by-default certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} "
.format(ee_domain_name) .format(ee_domain_name)
+ "--email {0} --text --agree-tos".format(ee_wp_email)) + "--email {0} --text --agree-tos".format(ee_wp_email))
mail_list = '' mail_list = ''
@ -1508,7 +1508,7 @@ def archivedCertificateHandle(self,domain,ee_wp_email):
elif check_prompt == "3": elif check_prompt == "3":
Log.info(self,"Please Wait while we renew SSL Certificate for your site.\nIt may take time depending upon network.") Log.info(self,"Please Wait while we renew SSL Certificate for your site.\nIt may take time depending upon network.")
ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} " ssl = EEShellExec.cmd_exec(self, "./letsencrypt-auto --renew-by-default certonly --webroot -w /var/www/{0}/htdocs/ -d {0} -d www.{0} "
.format(domain) .format(domain)
+ "--email {0} --text --agree-tos".format(ee_wp_email)) + "--email {0} --text --agree-tos".format(ee_wp_email))
else: else:

2
ee/core/variables.py

@ -12,7 +12,7 @@ class EEVariables():
"""Intialization of core variables""" """Intialization of core variables"""
# EasyEngine version # EasyEngine version
ee_version = "3.5.4" ee_version = "3.5.5"
# EasyEngine packages versions # EasyEngine packages versions

2
install

@ -48,7 +48,7 @@ fi
# Define variables for later use # Define variables for later use
ee_branch=$1 ee_branch=$1
readonly ee_version_old="2.2.3" readonly ee_version_old="2.2.3"
readonly ee_version_new="3.5.4" readonly ee_version_new="3.5.5"
readonly ee_log_dir=/var/log/ee/ readonly ee_log_dir=/var/log/ee/
readonly ee_install_log=/var/log/ee/install.log readonly ee_install_log=/var/log/ee/install.log
readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}') readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')

2
setup.py

@ -58,7 +58,7 @@ if not os.path.isfile('/root/.gitconfig'):
shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig')
setup(name='ee', setup(name='ee',
version='3.5.4', version='3.5.5',
description=long_description, description=long_description,
long_description=long_description, long_description=long_description,
classifiers=[], classifiers=[],

Loading…
Cancel
Save