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

Merge pull request #493 from WordOps/updating-configuration

Browse Source 
Fix OpenSuse repository gpg key
This commit is contained in:
VirtuBox
2023-01-09 08:52:19 +01:00
committed by GitHub
parent f52e4c8032 b51041ae2a
commit 528d3058eb
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install
View File

@@ -572,12 +572,8 @@ wo_upgrade_nginx() {
CHECK_PHP72=$(command -v php-fpm7.2) CHECK_PHP72=$(command -v php-fpm7.2)
# add new Nginx repository # add new Nginx repository
if [ "$wo_distro_version" == "jessie" ]; then # import the respository key for updates
# import the respository key for updates curl -sL https://build.opensuse.org/projects/home:virtubox/public_key | apt-key add -
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
# install new nginx package # install new nginx package
if { if {
@@ -755,6 +751,7 @@ wo_init() {
# import easyengine opensusebuildservice gpg key to avoid issues with packages update # 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 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 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 # 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 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 if [ -f /etc/apt/preferences.d/MariaDB.pref ]; then

3
wo/core/aptget.py
View File

@@ -46,7 +46,8 @@ class WOAptGet():
if "NO_PUBKEY" in single_error: if "NO_PUBKEY" in single_error:
key = single_error.rsplit(None, 1)[-1] key = single_error.rsplit(None, 1)[-1]
WORepo.add_key( WORepo.add_key(
self, key, keyserver="hkp://pgp.mit.edu") self, key,
keyserver="hkp://keyserver.ubuntu.com")
proc = subprocess.Popen( proc = subprocess.Popen(
'DEBIAN_FRONTEND=noninteractive apt-get update -qq', 'DEBIAN_FRONTEND=noninteractive apt-get update -qq',

2
wo/core/variables.py
View File

@@ -20,7 +20,7 @@ class WOVar():
wo_wp_cli = "2.7.1" wo_wp_cli = "2.7.1"
wo_adminer = "4.8.1" wo_adminer = "4.8.1"
wo_phpmyadmin = "5.2.0" wo_phpmyadmin = "5.2.0"
wo_extplorer = "2.1.13" wo_extplorer = "2.1.15"
wo_dashboard = "1.2" wo_dashboard = "1.2"
# Get WPCLI path # Get WPCLI path