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

Use MariaDB dynamic mirror

Browse Source
This commit is contained in:
VirtuBox
2024-06-13 00:23:05 +02:00
parent 30d8c435bd
commit 4a8641c6b3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ def pre_pref(self, apt_packages):
if not (WOVar.wo_distro == 'raspbian'): if not (WOVar.wo_distro == 'raspbian'):
Log.info(self, "Adding repository for MySQL, please wait...") Log.info(self, "Adding repository for MySQL, please wait...")
mysql_pref = ( mysql_pref = (
"Package: *\nPin: origin mariadb.mirrors.ovh.net" "Package: *\nPin: origin deb.mariadb.org"
"\nPin-Priority: 1000\n") "\nPin-Priority: 1000\n")
with open('/etc/apt/preferences.d/' with open('/etc/apt/preferences.d/'
'MariaDB.pref', 'w') as mysql_pref_file: 'MariaDB.pref', 'w') as mysql_pref_file:
@@ -41,7 +41,7 @@ def pre_pref(self, apt_packages):
mariadb_ver = self.app.config.get( mariadb_ver = self.app.config.get(
'mariadb', 'release') 'mariadb', 'release')
wo_mysql_repo_conf = ("deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] " wo_mysql_repo_conf = ("deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] "
"http://mariadb.mirrors.ovh.net/MariaDB/repo/" "https://deb.mariadb.org/"
f"{mariadb_ver}/{WOVar.wo_distro} {WOVar.wo_platform_codename} main") f"{mariadb_ver}/{WOVar.wo_distro} {WOVar.wo_platform_codename} main")
else: else:
wo_mysql_repo_conf = WOVar.wo_mysql_repo wo_mysql_repo_conf = WOVar.wo_mysql_repo

4
wo/core/apt_repo.py
View File

@@ -30,14 +30,14 @@ class WORepo():
try: try:
if not os.path.isfile(repo_file_path): if not os.path.isfile(repo_file_path):
with open(repo_file_path, with open(repo_file_path,
encoding='utf-8', mode='a') as repofile: encoding='utf-8', mode='w') as repofile:
repofile.write(repo_url) repofile.write(repo_url)
repofile.write('\n') repofile.write('\n')
repofile.close() repofile.close()
elif repo_url not in open(repo_file_path, elif repo_url not in open(repo_file_path,
encoding='utf-8').read(): encoding='utf-8').read():
with open(repo_file_path, with open(repo_file_path,
encoding='utf-8', mode='a') as repofile: encoding='utf-8', mode='w') as repofile:
repofile.write(repo_url) repofile.write(repo_url)
repofile.write('\n') repofile.write('\n')
repofile.close() repofile.close()

2
wo/core/variables.py
View File

@@ -188,7 +188,7 @@ class WOVar():
# APT repositories # APT repositories
wo_mysql_repo = ("deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] " wo_mysql_repo = ("deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] "
"http://mariadb.mirrors.ovh.net/MariaDB/repo/" "https://deb.mariadb.org/"
f"{mariadb_ver}/{wo_distro} {wo_platform_codename} main") f"{mariadb_ver}/{wo_distro} {wo_platform_codename} main")
mariadb_repo_key = "https://mariadb.org/mariadb_release_signing_key.pgp" mariadb_repo_key = "https://mariadb.org/mariadb_release_signing_key.pgp"
if wo_distro == 'ubuntu': if wo_distro == 'ubuntu':