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

Another fix

Browse Source
This commit is contained in:
VirtuBox
2019-09-06 13:09:26 +02:00
parent ea449e2626
commit d27d17cd4b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,8 +28,10 @@ from wo.core.variables import WOVariables
def pre_pref(self, apt_packages): def pre_pref(self, apt_packages):
"""Pre settings to do before installation packages""" """Pre settings to do before installation packages"""
if ((["mariadb-server"] in apt_packages) or if (not(["mariadb-server"] in apt_packages) and
(["mariadb-client"] in apt_packages)): (not ["mariadb-client"] in apt_packages)):
pass
else:
# add mariadb repository excepted on raspbian and ubuntu 19.04 # add mariadb repository excepted on raspbian and ubuntu 19.04
if (not WOVariables.wo_distro == 'raspbian'): if (not WOVariables.wo_distro == 'raspbian'):
Log.info(self, "Adding repository for MySQL, please wait...") Log.info(self, "Adding repository for MySQL, please wait...")
@@ -41,7 +43,7 @@ def pre_pref(self, apt_packages):
mysql_pref_file.write(mysql_pref) mysql_pref_file.write(mysql_pref)
WORepo.add(self, repo_url=WOVariables.wo_mysql_repo) WORepo.add(self, repo_url=WOVariables.wo_mysql_repo)
WORepo.add_key(self, '0xcbcb082a1bb943db', WORepo.add_key(self, '0xcbcb082a1bb943db',
keyserver='hkp://keys.gnupg.net') keyserver='keys.gnupg.net')
WORepo.add_key(self, '0xF1656F24C74CD1D8', WORepo.add_key(self, '0xF1656F24C74CD1D8',
keyserver='hkp://keys.gnupg.net') keyserver='hkp://keys.gnupg.net')
if ["mariadb-server"] in apt_packages: if ["mariadb-server"] in apt_packages:

2
wo/core/variables.py
View File

@@ -150,8 +150,6 @@ class WOVariables():
else: else:
wo_mysql_client = ["mariadb-client", "python3-mysql.connector"] wo_mysql_client = ["mariadb-client", "python3-mysql.connector"]
wo_mysql_keys = ['0xcbcb082a1bb943db', '0xF1656F24C74CD1D8']
wo_fail2ban = ["fail2ban"] wo_fail2ban = ["fail2ban"]
wo_clamav = ["clamav", "clamav-freshclam"] wo_clamav = ["clamav", "clamav-freshclam"]