diff --git a/CHANGELOG.md b/CHANGELOG.md index 699747d..95a3f46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.9.x - [Unreleased] +### v3.12.1 - 2020-05-14 + +#### Fixed + +- Redis repository on Ubuntu 20.04 LTS + +#### Changed + +- MariaDB offical repository available for Ubuntu 20.04 LTS + ### v3.12.0 - 2020-05-13 #### Added diff --git a/README.md b/README.md index d3adc99..bba5518 100644 --- a/README.md +++ b/README.md @@ -58,11 +58,12 @@ #### Recommended +- Ubuntu 20.04 LTS (Focal) - Ubuntu 18.04 LTS (Bionic) #### Also compatible -- Ubuntu 20.04 LTS (Focal) (experimental) +- Ubuntu 20.04 LTS (Focal) - Ubuntu 16.04 LTS (Xenial) - Debian 9 (Stretch) - Debian 10 (Buster) diff --git a/install b/install index 58216f2..4ad1640 100755 --- a/install +++ b/install @@ -9,7 +9,7 @@ # ------------------------------------------------------------------------- # wget -qO wo wops.cc && sudo -E bash wo # ------------------------------------------------------------------------- -# Version 3.12.0 - 2020-05-13 +# Version 3.12.1 - 2020-05-14 # ------------------------------------------------------------------------- # CONTENTS diff --git a/setup.py b/setup.py index b7ca510..13ba302 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ if os.geteuid() == 0: os.makedirs('/var/lib/wo/tmp/') setup(name='wordops', - version='3.12.0', + version='3.12.1', description='An essential toolset that eases server administration', long_description=LONG, long_description_content_type='text/markdown', diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 751a2b9..f93b84d 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -29,7 +29,7 @@ def pre_pref(self, apt_packages): if ("mariadb-server" in apt_packages or "mariadb-client" in apt_packages): # add mariadb repository excepted on raspbian and ubuntu 19.04 - if ((not WOVar.wo_distro == 'raspbian') and (not WOVar.wo_platform_codename == 'focal')): + if not WOVar.wo_distro == 'raspbian': Log.info(self, "Adding repository for MySQL, please wait...") mysql_pref = ( "Package: *\nPin: origin mariadb.mirrors.ovh.net" @@ -139,9 +139,10 @@ def pre_pref(self, apt_packages): # add redis repository if set(WOVar.wo_redis).issubset(set(apt_packages)): if WOVar.wo_distro == 'ubuntu': - Log.info(self, "Adding repository for Redis, please wait...") - Log.debug(self, 'Adding ppa for redis') - WORepo.add(self, ppa=WOVar.wo_redis_repo) + 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) else: if not WOFileUtils.grepcheck( self, '/etc/apt/sources.list/wo-repo.list', diff --git a/wo/core/variables.py b/wo/core/variables.py index 50b18f8..2c5a718 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -14,7 +14,7 @@ class WOVar(): """Intialization of core variables""" # WordOps version - wo_version = "3.12.0" + wo_version = "3.12.1" # WordOps packages versions wo_wp_cli = "2.4.0" wo_adminer = "4.7.5"