Several improvements

* logging improvements
* gpg keys import improvements
This commit is contained in:
VirtuBox
2019-09-06 02:23:40 +02:00
parent 391e13c709
commit 0e356edba9
8 changed files with 152 additions and 71 deletions

View File

@@ -83,7 +83,8 @@ class WORepo():
default keyserver is hkp://keyserver.ubuntu.com
user can provide other keyserver with keyserver="hkp://xyz"
"""
all_keys = ' '.join(keyids)
WOShellExec.cmd_exec(self, "apt-key adv --keyserver {serv}"
.format(serv=(keyserver or
"hkp://keyserver.ubuntu.com")) +
" --recv-keys {key}".format(key=keyids))
" --recv-keys {keys}".format(key=all_keys))

View File

@@ -109,7 +109,7 @@ class WOVariables():
.format(wo_deb_repo))
wo_nginx = ["nginx-custom", "nginx-wo"]
wo_nginx_key = '188C9FB063F0247A'
wo_nginx_key = ['188C9FB063F0247A']
# PHP repo and packages
if wo_distro == 'ubuntu':
@@ -118,7 +118,7 @@ class WOVariables():
wo_php_repo = (
"deb https://packages.sury.org/php/ {codename} main"
.format(codename=wo_platform_codename))
wo_php_key = 'AC0E47584A7A714D'
wo_php_key = ['AC0E47584A7A714D']
wo_php = ["php7.2-fpm", "php7.2-curl", "php7.2-gd", "php7.2-imap",
"php7.2-readline", "php7.2-common", "php7.2-recode",
@@ -150,8 +150,6 @@ class WOVariables():
else:
wo_mysql_client = ["mariadb-client", "python3-mysql.connector"]
wo_fail2ban = ["fail2ban"]
wo_clamav = ["clamav", "clamav-freshclam"]