Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #563 from WordOps/updating-configuration

Browse Source 
Improve MariaDB setup with version selection from wo.conf
This commit is contained in:
VirtuBox
2023-08-13 17:25:58 +02:00
committed by GitHub
parent 9281509c81 b795784cda
commit f2eb842ce7
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wo/cli/plugins/stack_migrate.py
View File

@@ -48,8 +48,14 @@ class WOStackMigrateController(CementBaseController):
if 'repo' in current_mysql_version:
current_mysql_version = current_mysql_version[5]
mariadb_release = WOVar.mariadb_ver
if mariadb_release != current_mysql_version:
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")
return 0

39
wo/cli/plugins/stack_pref.py
View File

@@ -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 version in list(WOVar.wo_php_versions.values()):
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")