Skip to content

Commit f21d3b0

Browse files
mbtamulimbtamuli
committed
Update ee version to 3.8.0
2 parents ebadd27 + 964f80a commit f21d3b0

File tree

11 files changed

+82
-126
lines changed

11 files changed

+82
-126
lines changed

‎CHANGELOG.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v3.8.0 - May 29, 2018
2+
- Add support for Ubuntu 18.04 and remove support for Ubuntu 12.04
3+
- Nginx build for EasyEngine updated to 1.14.0
4+
- Update WP-CLI version to 1.5.1
5+
- Update Roundcube to 1.3.6
6+
- Update Adminer to 4.6.2
7+
18
v3.7.5 - Mar 30, 2018
29
- Replace pymysql3 with PyMySQL [critical]
310
- Upgrade wp-cli version to 1.4.1

‎ee/cli/plugins/debug.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -194,28 +194,28 @@ 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/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5") +
197+
EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5") +
198198
"xdebug.ini",
199199
";zend_extension",
200200
"zend_extension")
201201

202202
# Fix slow log is not enabled default in PHP5.6
203203
config = configparser.ConfigParser()
204-
config.read('/etc/{0}/fpm/pool.d/debug.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
205-
config['debug']['slowlog'] = '/var/log/{0}/slow.log'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5")
204+
config.read('/etc/{0}/fpm/pool.d/debug.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
205+
config['debug']['slowlog'] = '/var/log/{0}/slow.log'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5")
206206
config['debug']['request_slowlog_timeout'] = '10s'
207-
with open('/etc/{0}/fpm/pool.d/debug.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"),
207+
with open('/etc/{0}/fpm/pool.d/debug.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"),
208208
encoding='utf-8', mode='w') as confifile:
209209
Log.debug(self, "Writting debug.conf configuration into "
210-
"/etc/{0}/fpm/pool.d/debug.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
210+
"/etc/{0}/fpm/pool.d/debug.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
211211
config.write(confifile)
212212

213213
self.trigger_php = True
214214
self.trigger_nginx = True
215215
else:
216216
Log.info(self, "PHP debug is already enabled")
217217

218-
self.msg = self.msg + ['/var/log/{0}/slow.log'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5")]
218+
self.msg = self.msg + ['/var/log/{0}/slow.log'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5")]
219219

220220
# PHP global debug stop
221221
elif (self.app.pargs.php == 'off' and not self.app.pargs.site_name):
@@ -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/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5") +
236+
EEFileUtils.searchreplace(self, "/etc/{0}/mods-available/".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5") +
237237
"xdebug.ini",
238238
"zend_extension",
239239
";zend_extension")
@@ -249,38 +249,38 @@ def debug_fpm(self):
249249
# PHP5-FPM start global debug
250250
if (self.app.pargs.fpm == 'on' and not self.app.pargs.site_name):
251251
if not EEShellExec.cmd_exec(self, "grep \"log_level = debug\" "
252-
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5")):
252+
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5")):
253253
Log.info(self, "Setting up PHP5-FPM log_level = debug")
254254
config = configparser.ConfigParser()
255-
config.read('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
255+
config.read('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
256256
config.remove_option('global', 'include')
257257
config['global']['log_level'] = 'debug'
258-
config['global']['include'] = '/etc/{0}/fpm/pool.d/*.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5")
259-
with open('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"),
258+
config['global']['include'] = '/etc/{0}/fpm/pool.d/*.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5")
259+
with open('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"),
260260
encoding='utf-8', mode='w') as configfile:
261261
Log.debug(self, "Writting php5-FPM configuration into "
262-
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
262+
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
263263
config.write(configfile)
264264
self.trigger_php = True
265265
else:
266266
Log.info(self, "PHP5-FPM log_level = debug already setup")
267267

268-
self.msg = self.msg + ['/var/log/{0}/fpm.log'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5")]
268+
self.msg = self.msg + ['/var/log/{0}/fpm.log'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5")]
269269

270270
# PHP5-FPM stop global debug
271271
elif (self.app.pargs.fpm == 'off' and not self.app.pargs.site_name):
272272
if EEShellExec.cmd_exec(self, "grep \"log_level = debug\" "
273-
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5")):
273+
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5")):
274274
Log.info(self, "Disabling PHP5-FPM log_level = debug")
275275
config = configparser.ConfigParser()
276-
config.read('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
276+
config.read('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
277277
config.remove_option('global', 'include')
278278
config['global']['log_level'] = 'notice'
279-
config['global']['include'] = '/etc/{0}/fpm/pool.d/*.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5")
280-
with open('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"),
279+
config['global']['include'] = '/etc/{0}/fpm/pool.d/*.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5")
280+
with open('/etc/{0}/fpm/php-fpm.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"),
281281
encoding='utf-8', mode='w') as configfile:
282282
Log.debug(self, "writting php5 configuration into "
283-
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
283+
"/etc/{0}/fpm/php-fpm.conf".format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
284284
config.write(configfile)
285285

286286
self.trigger_php = True
@@ -626,7 +626,7 @@ def signal_handler(self, signal, frame):
626626

627627
# Reload PHP
628628
if self.trigger_php:
629-
if EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial':
629+
if EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic':
630630
if EEAptGet.is_installed(self,'php5.6-fpm'):
631631
EEService.reload_service(self, 'php5.6-fpm')
632632
if EEAptGet.is_installed(self,'php7.0-fpm'):
@@ -717,7 +717,7 @@ def default(self):
717717
self.app.pargs.nginx = 'on'
718718
self.app.pargs.php = 'on'
719719
self.app.pargs.fpm = 'on'
720-
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') and EEAptGet.is_installed(self,'php7.0-fpm'):
720+
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') and EEAptGet.is_installed(self,'php7.0-fpm'):
721721
self.app.pargs.php7 = 'on'
722722
self.app.pargs.fpm7 = 'on'
723723
self.app.pargs.mysql = 'on'
@@ -729,7 +729,7 @@ def default(self):
729729
self.app.pargs.nginx = 'off'
730730
self.app.pargs.php = 'off'
731731
self.app.pargs.fpm = 'off'
732-
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') and EEAptGet.is_installed(self,'php7.0-fpm'):
732+
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') and EEAptGet.is_installed(self,'php7.0-fpm'):
733733
self.app.pargs.php7 = 'off'
734734
self.app.pargs.fpm7 = 'off'
735735
self.app.pargs.mysql = 'off'
@@ -774,7 +774,7 @@ def default(self):
774774
EEService.reload_service(self, 'nginx')
775775
# Reload PHP
776776
if self.trigger_php:
777-
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial'):
777+
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic'):
778778
if EEAptGet.is_installed(self,'php5.6-fpm'):
779779
EEService.restart_service(self, 'php5.6-fpm')
780780
if EEAptGet.is_installed(self,'php7.0-fpm'):

‎ee/cli/plugins/info.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ def info_nginx(self):
6767
@expose(hide=True)
6868
def info_php(self):
6969
"""Display PHP information"""
70-
version = os.popen("{0} -v 2>/dev/null | head -n1 | cut -d' ' -f2 |".format("php5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php") +
70+
version = os.popen("{0} -v 2>/dev/null | head -n1 | cut -d' ' -f2 |".format("php5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php") +
7171
" cut -d'+' -f1 | tr -d '\n'").read
7272
config = configparser.ConfigParser()
73-
config.read('/etc/{0}/fpm/php.ini'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
73+
config.read('/etc/{0}/fpm/php.ini'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
7474
expose_php = config['PHP']['expose_php']
7575
memory_limit = config['PHP']['memory_limit']
7676
post_max_size = config['PHP']['post_max_size']
7777
upload_max_filesize = config['PHP']['upload_max_filesize']
7878
max_execution_time = config['PHP']['max_execution_time']
7979

80-
config.read('/etc/{0}/fpm/pool.d/www.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
80+
config.read('/etc/{0}/fpm/pool.d/www.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
8181
www_listen = config['www']['listen']
8282
www_ping_path = config['www']['ping.path']
8383
www_pm_status_path = config['www']['pm.status_path']
@@ -95,7 +95,7 @@ def info_php(self):
9595
except Exception as e:
9696
www_xdebug = 'off'
9797

98-
config.read('/etc/{0}/fpm/pool.d/debug.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial') else "php5"))
98+
config.read('/etc/{0}/fpm/pool.d/debug.conf'.format("php/5.6" if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic') else "php5"))
9999
debug_listen = config['debug']['listen']
100100
debug_ping_path = config['debug']['ping.path']
101101
debug_pm_status_path = config['debug']['pm.status_path']

‎ee/cli/plugins/site_functions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,15 +717,15 @@ def site_package_check(self, stype):
717717

718718
if not self.app.pargs.php7 and stype in ['php', 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
719719
Log.debug(self, "Setting apt_packages variable for PHP")
720-
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial'):
720+
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic'):
721721
if not EEAptGet.is_installed(self, 'php5.6-fpm'):
722722
apt_packages = apt_packages + EEVariables.ee_php5_6 + EEVariables.ee_php_extra
723723
else:
724724
if not EEAptGet.is_installed(self, 'php5-fpm'):
725725
apt_packages = apt_packages + EEVariables.ee_php
726726

727727
if self.app.pargs.php7 and stype in [ 'mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
728-
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial'):
728+
if (EEVariables.ee_platform_codename == 'trusty' or EEVariables.ee_platform_codename == 'xenial' or EEVariables.ee_platform_codename == 'bionic'):
729729
Log.debug(self, "Setting apt_packages variable for PHP 5.6")
730730
if not EEAptGet.is_installed(self, 'php5.6-fpm'):
731731
apt_packages = apt_packages + EEVariables.ee_php5_6

0 commit comments

Comments
 (0)