Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for webmin main repo #1987

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −8
Open

Add support for webmin main repo #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup-repos.sh
View file
Open in desktop
Expand Up @@ -166,7 +166,7 @@ deb)
echo " .. done"
# Create repo file
echo " Setting up Webmin repository .."
echo "deb [signed-by=/usr/share/keyrings/$repoid_debian_like-$webmin_key_suffix.gpg] $webmin_download/download/newkey/repository stable contrib" >$debian_repo_file
echo "deb [signed-by=/usr/share/keyrings/$repoid_debian_like-$webmin_key_suffix.gpg] $webmin_download/download/repo webmin main" >$debian_repo_file
echo " .. done"
# Clean meta
echo " Cleaning repository metadata .."
Expand Down
4 changes: 2 additions & 2 deletions webmin/fix_repo.cgi
View file
Open in desktop
Expand Up @@ -44,8 +44,8 @@ foreach my $repo ($webmin_apt_repo_file, $global_apt_repo_file) {
}
};
foreach my $l (@$lref) {
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/repository)\s+sarge\s+contrib/) {
$l = &$lreffix("deb [signed-by=$webmin_apt_repo_key] $webmin_apt_repo_url stable contrib");
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/(repository|newkey\/repository))\s+(sarge|stable)\s+contrib/) {
$l = &$lreffix("deb [signed-by=$webmin_apt_repo_key] $webmin_apt_repo_url webmin main");
$fixed++;
}
}
Expand Down
2 changes: 1 addition & 1 deletion webmin/lang/en
View file
Open in desktop
Expand Up @@ -1014,7 +1014,7 @@ notif_updateok=Install Updates Now
notif_reboot=Recent package updates (such as a new kernel version) require a reboot to be fully applied.
notif_rebootok=Reboot Now
notify_yumrepo=Your system is using the old Webmin repository. Click the button below to switch to the new repository URL <tt>$1</tt> in order to use our latest signing key and ensure access to updated Webmin versions.
notify_aptrepo=Your system is using the old Webmin repository. Click the button below to switch to the new <tt>stable</tt> repository URL <tt>$1</tt> in order to use our latest signing key and ensure access to updated Webmin versions.
notify_aptrepo_newkey=Your system is using obsolete Webmin repository. Please click the button below to switch to the new <tt>webmin main</tt> repository URL <tt>$1</tt> in order to use our latest signing key and ensure access to updated Webmin versions.
notif_fixreponow=Update Webmin Repository

status_title=Background Status Collection
Expand Down
9 changes: 5 additions & 4 deletions webmin/webmin-lib.pl
View file
Open in desktop
Expand Up @@ -67,8 +67,10 @@ =head1 webmin-lib.pl
our $webmin_yum_repo_key = "/etc/pki/rpm-gpg/RPM-GPG-KEY-webmin-developers";

our $webmin_apt_repo_file = "/etc/apt/sources.list.d/webmin.list";
our $webmin_apt_repo_url = "https://download.webmin.com/download/newkey/repository";
our $webmin_apt_repo_url = "https://download.webmin.com/download/repo";
our $webmin_apt_repo_key = "/usr/share/keyrings/debian-webmin-developers.gpg";
$webmin_apt_repo_key = "/usr/share/keyrings/ubuntu-webmin-developers.gpg"
if ($gconfig{'real_os_type'} =~ /ubuntu/i);
our $global_apt_repo_file = "/etc/apt/sources.list";

# Obsolete, but still defined so it can be deleted
Expand Down Expand Up @@ -1340,9 +1342,8 @@ sub get_webmin_notifications
next if (!-r $repo);
my $lref = &read_file_lines($repo, 1);
foreach my $l (@$lref) {
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/repository)\s+sarge\s+contrib/) {
$repoerr = &text('notify_aptrepo',
$webmin_apt_repo_url);
if ($l =~ /^\s*deb\s+.*?((http|https):\/\/download.webmin.com\/download\/(repository|newkey\/repository))\s+(sarge|stable)\s+contrib/) {
$repoerr = &text('notify_aptrepo_newkey', $webmin_apt_repo_url);
last;
}
}
Expand Down