From dc84fe03d296a5941a78c156dbcbddae09bdcb48 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 5 Jan 2023 22:02:12 +0100 Subject: [PATCH 1/3] Add new GPG key for Nginx repository --- install | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/install b/install index 3467fed..9d359c9 100755 --- a/install +++ b/install @@ -572,12 +572,8 @@ wo_upgrade_nginx() { CHECK_PHP72=$(command -v php-fpm7.2) # add new Nginx repository - if [ "$wo_distro_version" == "jessie" ]; then - # import the respository key for updates - curl -sL https://build.opensuse.org/projects/home:virtubox/public_key | apt-key add - - else - curl -sL https://build.opensuse.org/projects/home:virtubox/public_key | apt-key add - - fi + # import the respository key for updates + curl -sL https://build.opensuse.org/projects/home:virtubox/public_key | apt-key add - # install new nginx package if { @@ -755,6 +751,7 @@ wo_init() { # import easyengine opensusebuildservice gpg key to avoid issues with packages update apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3050ac3cd2ae6f03 >/dev/null 2>&1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xF1656F24C74CD1D8 >/dev/null 2>&1 + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys cf0b928cded64f3b >/dev/null 2>&1 # fix digitalocean mariadb repository issue sed -i 's/sfo1.mirrors.digitalocean.com\/mariadb/mariadb.mirrors.ovh.net\/MariaDB/' /etc/apt/sources.list.d/*.list >/dev/null 2>&1 if [ -f /etc/apt/preferences.d/MariaDB.pref ]; then From 878bd96aa024b67e9a89bfd569d6c6c3fbff2350 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 5 Jan 2023 22:02:39 +0100 Subject: [PATCH 2/3] Change gpg server in case of failure --- wo/core/aptget.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wo/core/aptget.py b/wo/core/aptget.py index 28f583d..2866bea 100644 --- a/wo/core/aptget.py +++ b/wo/core/aptget.py @@ -46,7 +46,8 @@ class WOAptGet(): if "NO_PUBKEY" in single_error: key = single_error.rsplit(None, 1)[-1] WORepo.add_key( - self, key, keyserver="hkp://pgp.mit.edu") + self, key, + keyserver="hkp://keyserver.ubuntu.com") proc = subprocess.Popen( 'DEBIAN_FRONTEND=noninteractive apt-get update -qq', From b51041ae2a44ab39eee954fd5794858c7ba1a2f4 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 5 Jan 2023 22:02:52 +0100 Subject: [PATCH 3/3] Bump extplorer release --- wo/core/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/core/variables.py b/wo/core/variables.py index 1403c81..30e522f 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -20,7 +20,7 @@ class WOVar(): wo_wp_cli = "2.7.1" wo_adminer = "4.8.1" wo_phpmyadmin = "5.2.0" - wo_extplorer = "2.1.13" + wo_extplorer = "2.1.15" wo_dashboard = "1.2" # Get WPCLI path