Skip to content

Commit

Permalink
Fix to abstract lib URL
Browse files Browse the repository at this point in the history
  • Loading branch information
iliajie committed Sep 20, 2023
1 parent 6528099 commit 488c317
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions virtualmin-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ vm_version=7

# Server
upgrade_virtualmin_host=software.virtualmin.com
upgrade_virtualmin_host_mods="$upgrade_virtualmin_host/lib/mods"
upgrade_virtualmin_host_lib="$upgrade_virtualmin_host/lib"
upgrade_virtualmin_host_mods="$upgrade_virtualmin_host_lib/mods"

# Currently supported systems
# https://www.virtualmin.com/os-support/
Expand Down Expand Up @@ -295,7 +296,7 @@ download_slib() {
else
# We need HTTP client first
pre_check_http_client
$download "https://$upgrade_virtualmin_host/lib/slib.sh" >>"$log" 2>&1
$download "https://$upgrade_virtualmin_host_lib/slib.sh" >>"$log" 2>&1
if [ $? -ne 0 ]; then
echo "Error: Failed to download utility function library. Cannot continue. Check your network connection and DNS settings."
exit 1
Expand Down Expand Up @@ -1138,10 +1139,10 @@ install_virtualmin_release() {

# Install our keys
log_debug "Installing Webmin and Virtualmin package signing keys .."
download "https://$upgrade_virtualmin_host/lib/RPM-GPG-KEY-virtualmin-$vm_version" "Downloading Virtualmin $vm_version key"
download "https://$upgrade_virtualmin_host_lib/RPM-GPG-KEY-virtualmin-$vm_version" "Downloading Virtualmin $vm_version key"
run_ok "gpg --import RPM-GPG-KEY-virtualmin-$vm_version && cat RPM-GPG-KEY-virtualmin-$vm_version | gpg --dearmor > /usr/share/keyrings/$repoid_debian_like-virtualmin-$vm_version.gpg" "Installing Virtualmin $vm_version key"
if [ "$vm6_repos" -eq 1 ]; then
download "https://$upgrade_virtualmin_host/lib/RPM-GPG-KEY-webmin" "Downloading Webmin key"
download "https://$upgrade_virtualmin_host_lib/RPM-GPG-KEY-webmin" "Downloading Webmin key"
run_ok "gpg --import RPM-GPG-KEY-webmin && cat RPM-GPG-KEY-webmin | gpg --dearmor > /usr/share/keyrings/$repoid_debian_like-webmin.gpg" "Installing Webmin key"
fi
run_ok "apt-get update" "Downloading repository metadata"
Expand Down

0 comments on commit 488c317

Please sign in to comment.