Fix nanorc install, update Redis to 6.0.6

This commit is contained in:
VirtuBox 2020-10-15 12:24:51 +02:00
parent 8a5f6ca692
commit ba4b83a512
Signed by: virtubox
GPG Key ID: 22EB296C97BAD476
2 changed files with 10 additions and 6 deletions

View File

@ -10,11 +10,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### v3.12.4 - 2020-10-14
#### Changed
- Redis 6.0.6 available on Ubuntu LTS
#### Fixed
- Avif (AV1 Image Format) & WebP Nginx conditional support([PR #322](https://github.com/WordOps/WordOps/pull/322))
- Sendmail initial configuration with sendmailconfig
- SSL certificates export encoding with utf-8
- Nanorc install on Ubuntu 16.04 LTS
### v3.12.3 - 2020-10-13

View File

@ -139,10 +139,9 @@ def pre_pref(self, apt_packages):
# add redis repository
if set(WOVar.wo_redis).issubset(set(apt_packages)):
if WOVar.wo_distro == 'ubuntu':
if not WOVar.wo_platform_codename == 'focal':
Log.info(self, "Adding repository for Redis, please wait...")
Log.debug(self, 'Adding ppa for redis')
WORepo.add(self, ppa=WOVar.wo_redis_repo)
Log.info(self, "Adding repository for Redis, please wait...")
Log.debug(self, 'Adding ppa for redis')
WORepo.add(self, ppa=WOVar.wo_redis_repo)
else:
if not WOFileUtils.grepcheck(
self, '/etc/apt/sources.list/wo-repo.list',
@ -157,9 +156,9 @@ def pre_pref(self, apt_packages):
Log.debug(self, 'Adding ppa for nano')
WORepo.add(self, ppa=WOVar.wo_ubuntu_backports)
else:
if not WOFileUtils.grepcheck(
if (not WOFileUtils.grepcheck(
self, '/etc/apt/sources.list/wo-repo.list',
'WordOps'):
'WordOps') and not WOVar.wo_platform_codename == 'focal'):
Log.info(self, "Adding repository for Nano, please wait...")
Log.debug(self, 'Adding repository for Nano')
WORepo.add_key(self, WOVar.wo_nginx_key)