michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Also update MySQL to MariaDB in text strings https://github.com/virtualmin/virtualmin-gpl/issues/798

Browse Source
This commit is contained in:
Jamie Cameron
2024-05-01 20:30:48 -07:00
parent d9d4522430
commit bff3e78630
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
status/status-lib.pl
View File

@@ -45,6 +45,17 @@ $templates_dir = "$module_config_directory/templates";
@monitor_statuses = ( 'up', 'down', 'un', 'webmin', 'timed', 'isdown' );
$mysql_variant = "mysql";
if (&foreign_check("mysql")) {
# Fix MySQL / MariaDB
&foreign_require("mysql");
if ($mysql::mysql_version =~ /mariadb/i) {
$mysql_variant = "mariadb";
}
}
if ($mysql_variant eq "mariadb") {
$text{'type_mysql'} =~ s/MySQL/MariaDB/g;
}
# list_services()
# Returns a list of all services this module knows how to get status on.
@@ -66,12 +77,8 @@ while($f = readdir(DIR)) {
my $serv = &get_service($1);
next if (!$serv || !$serv->{'type'} || !$serv->{'id'});
if ($serv->{'default'} && $serv->{'id'} eq 'mysql' &&
&foreign_check("mysql")) {
# Fix MySQL / MariaDB
&foreign_require("mysql");
if ($mysql::mysql_version =~ /mariadb/i) {
$serv->{'desc'} =~ s/MySQL/MariaDB/g;
}
$mysql_variant eq "mariadb") {
$serv->{'desc'} =~ s/MySQL/MariaDB/g;
}
if ($serv->{'depends'}) {
my $d;