From 2c7ac9552e17b72d3a958bde3fcabb9583116423 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 13 Aug 2023 12:32:17 +0200 Subject: [PATCH 1/4] Fix mariadb version validation --- wo/cli/plugins/stack_migrate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/cli/plugins/stack_migrate.py b/wo/cli/plugins/stack_migrate.py index 63b432d..1fcdddf 100644 --- a/wo/cli/plugins/stack_migrate.py +++ b/wo/cli/plugins/stack_migrate.py @@ -49,7 +49,7 @@ class WOStackMigrateController(CementBaseController): current_mysql_version = current_mysql_version[5] mariadb_release = WOVar.mariadb_ver - if mariadb_release != current_mysql_version: + if mariadb_release == current_mysql_version: Log.info(self, "You already have the latest " "MariaDB version available") return 0 From 24c598e9a0804b09499a3095f8e1635e44c3eeea Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 13 Aug 2023 13:16:39 +0200 Subject: [PATCH 2/4] Improve mariadb setup with version conf --- wo/cli/plugins/stack_pref.py | 39 +++++++++++++++++------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index fca4b6b..6ff37be 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -38,7 +38,19 @@ def pre_pref(self, apt_packages): with open('/etc/apt/preferences.d/' 'MariaDB.pref', 'w') as mysql_pref_file: mysql_pref_file.write(mysql_pref) - WORepo.add(self, repo_url=WOVar.wo_mysql_repo) + if self.app.config.has_section('mariadb'): + mariadb_ver = self.app.config.get( + 'mariadb', 'release') + wo_mysql_repo_conf = ("deb [arch=amd64,arm64,ppc64el] " + "http://mariadb.mirrors.ovh.net/MariaDB/repo/" + "{version}/{distro} {codename} main" + .format(version=mariadb_ver, + distro=WOVar.wo_distro, + codename=WOVar.wo_platform_codename)) + else: + wo_mysql_repo_conf = WOVar.wo_mysql_repo + # APT repositories + WORepo.add(self, repo_url=wo_mysql_repo_conf) WORepo.add_key(self, '0xcbcb082a1bb943db', keyserver='keyserver.ubuntu.com') WORepo.add_key(self, '0xF1656F24C74CD1D8', @@ -227,14 +239,7 @@ def post_pref(self, apt_packages, packages, upgrade=False): .format(ngxcom), 'wpsubdir.mustache', data) - wo_php_version = ["php72", - "php73", - "php74", - "php80", - "php81", - "php82", - ] - for wo_php in wo_php_version: + for wo_php in WOVar.wo_php_versions: data = dict(upstream="{0}".format(wo_php), release=WOVar.wo_version) WOConf.nginxcommon(self) @@ -468,18 +473,10 @@ def post_pref(self, apt_packages, packages, upgrade=False): # php conf php_list = [] - if 'php7.2-fpm' in apt_packages: - php_list = php_list + [["7.2"]] - if 'php7.3-fpm' in apt_packages: - php_list = php_list + [["7.3"]] - if 'php7.4-fpm' in apt_packages: - php_list = php_list + [["7.4"]] - if 'php8.0-fpm' in apt_packages: - php_list = php_list + [["8.0"]] - if 'php8.1-fpm' in apt_packages: - php_list = php_list + [["8.1"]] - if 'php8.2-fpm' in apt_packages: - php_list = php_list + [["8.2"]] + for pargs_version, version in WOVar.wo_php_versions.items(): + package_name = 'php' + version.replace('.', '') + '-fpm' + if package_name in apt_packages: + php_list.append([version]) for php_version in php_list: WOGit.add(self, ["/etc/php"], msg="Adding PHP into Git") From 5e6e1685636e7e2d2c87da6bbaf8b2a9bf28c333 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 13 Aug 2023 14:51:30 +0200 Subject: [PATCH 3/4] Improve mariadb migrate --- wo/cli/plugins/stack_migrate.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wo/cli/plugins/stack_migrate.py b/wo/cli/plugins/stack_migrate.py index 1fcdddf..9fdde5b 100644 --- a/wo/cli/plugins/stack_migrate.py +++ b/wo/cli/plugins/stack_migrate.py @@ -48,7 +48,13 @@ class WOStackMigrateController(CementBaseController): if 'repo' in current_mysql_version: current_mysql_version = current_mysql_version[5] - mariadb_release = WOVar.mariadb_ver + if self.app.config.has_section('mariadb'): + mariadb_release = self.app.config.get( + 'mariadb', 'release') + if mariadb_release < WOVar.mariadb_ver: + mariadb_release = WOVar.mariadb_ver + else: + mariadb_release = WOVar.mariadb_ver if mariadb_release == current_mysql_version: Log.info(self, "You already have the latest " "MariaDB version available") From b795784cdaaa251cc3ad9398a945d4c70f55530c Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sun, 13 Aug 2023 15:07:26 +0200 Subject: [PATCH 4/4] Fix unused variable --- wo/cli/plugins/stack_pref.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 6ff37be..b49b3fe 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -473,7 +473,7 @@ def post_pref(self, apt_packages, packages, upgrade=False): # php conf php_list = [] - for pargs_version, version in WOVar.wo_php_versions.items(): + for version in list(WOVar.wo_php_versions.values()): package_name = 'php' + version.replace('.', '') + '-fpm' if package_name in apt_packages: php_list.append([version])