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

Fix apt-key add

Browse Source
This commit is contained in:
VirtuBox
2019-09-06 02:41:11 +02:00
parent 9a231840c4
commit 1d1e85fd20
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,11 @@ from wo.core.variables import WOVariables
def pre_pref(self, apt_packages): def pre_pref(self, apt_packages):
apt_repo_key = []
"""Pre settings to do before installation packages""" """Pre settings to do before installation packages"""
apt_repo_keys = []
if (set(["mariadb-server"]).issubset(set(apt_packages)) or if ((["mariadb-server"] in apt_packages) or
set(["mariadb-client"]).issubset(set(apt_packages)) or (["mariadb-client"] in apt_packages)):
set(["mariadb-backup"]).issubset((set(apt_packages)))):
# 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...")
@@ -42,9 +41,9 @@ def pre_pref(self, apt_packages):
'MariaDB.pref', 'w') as mysql_pref_file: 'MariaDB.pref', 'w') as mysql_pref_file:
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)
apt_repo_key = (apt_repo_key + apt_repo_keys = (apt_repo_keys +
['0xcbcb082a1bb943db', '0xF1656F24C74CD1D8']) ['0xcbcb082a1bb943db', '0xF1656F24C74CD1D8'])
if set(["mariadb-server"]).issubset(set(apt_packages)): if ["mariadb-server"] in apt_packages:
# generate random 24 characters root password # generate random 24 characters root password
chars = ''.join(random.sample(string.ascii_letters, 24)) chars = ''.join(random.sample(string.ascii_letters, 24))
@@ -111,11 +110,9 @@ def pre_pref(self, apt_packages):
WORepo.add(self, ppa=WOVariables.wo_nginx_repo) WORepo.add(self, ppa=WOVariables.wo_nginx_repo)
Log.debug(self, 'Adding ppa for Nginx') Log.debug(self, 'Adding ppa for Nginx')
else: else:
apt_repo_key = apt_repo_key + WOVariables.wo_nginx_key apt_repo_keys = apt_repo_keys + WOVariables.wo_nginx_key
WORepo.add(self, repo_url=WOVariables.wo_nginx_repo) WORepo.add(self, repo_url=WOVariables.wo_nginx_repo)
Log.debug(self, 'Adding repository for Nginx') Log.debug(self, 'Adding repository for Nginx')
WORepo.add_key(self, WOVariables.wo_nginx_key)
# add php repository # add php repository
if (set(WOVariables.wo_php73).issubset(set(apt_packages)) or if (set(WOVariables.wo_php73).issubset(set(apt_packages)) or
@@ -136,8 +133,7 @@ def pre_pref(self, apt_packages):
Log.debug(self, 'Adding repo_url of php for debian') Log.debug(self, 'Adding repo_url of php for debian')
WORepo.add(self, repo_url=WOVariables.wo_php_repo) WORepo.add(self, repo_url=WOVariables.wo_php_repo)
Log.debug(self, 'Adding deb.sury GPG key') Log.debug(self, 'Adding deb.sury GPG key')
apt_repo_key = apt_repo_key + WOVariables.wo_php_key apt_repo_keys = apt_repo_keys + WOVariables.wo_php_key
WORepo.add_key(self, WOVariables.wo_php_key)
# add redis repository # add redis repository
if set(['redis-server']).issubset(set(apt_packages)): if set(['redis-server']).issubset(set(apt_packages)):
Log.info(self, "Adding repository for Redis, please wait...") Log.info(self, "Adding repository for Redis, please wait...")
@@ -145,7 +141,7 @@ def pre_pref(self, apt_packages):
Log.debug(self, 'Adding ppa for redis') Log.debug(self, 'Adding ppa for redis')
WORepo.add(self, ppa=WOVariables.wo_redis_repo) WORepo.add(self, ppa=WOVariables.wo_redis_repo)
if (apt_repo_key): if (apt_repo_keys):
WORepo.add_key(self, apt_repo_key) WORepo.add_key(self, apt_repo_key)