michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show correct version, and fix calls to init scripts

Browse Source
This commit is contained in:
Jamie Cameron
2014-02-22 21:09:42 -08:00
parent 5298ceb6f8
commit 99d99719fc
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bacula-backup/bacula-backup-lib.pl
View File

@@ -624,8 +624,8 @@ foreach my $i (@bacula_inits) {
$action eq "restart" ? \&init::restart_action :
undef;
$func || return "Unknown init action $action";
local $err = &$func($i);
if ($err) {
local ($ok, $err) = &$func($i);
if (!$ok) {
return &text('start_erun', "<tt>$i</tt>", "<pre>$err</pre>");
}
}

11
bacula-backup/index.cgi
View File

@@ -42,11 +42,12 @@ if (&has_bacula_dir() && &has_node_groups()) {
# Get the Bacula version, and check it
$ver = &get_bacula_version();
&ui_print_header(undef, $module_info{'desc'}, "", "intro", 1, 1, 0,
$hsl, undef, undef,
($ver ? &text('index_version', $ver)."<br>" : undef).
&text('index_ocmin', 'images/ocmin.gif',
'http://www.linmin.com/'));
&ui_print_header(
undef, $module_info{'desc'}, "", "intro", 1, 1, 0,
$hsl, undef, undef,
($ver ? &text('index_version'.$cmd_prefix, $ver)."<br>" : undef).
&text('index_ocmin', 'images/ocmin.gif',
'http://www.linmin.com/'));
if ($ver && $ver < 1.36) {
print &text('index_eversion', 1.36, $ver),"<p>\n";
&ui_print_footer("/", $text{'index'});

6
bacula-backup/lang/en
View File

@@ -19,7 +19,8 @@ index_status=Process statuses:
index_up=Up
index_down=Down
index_return=module index
index_version=Bacula $1
index_versionbacula=Bacula $1
index_versionbareos=Bareos $1
index_notrun=Backups and other operations cannot be performed as the Bacula Directory daemon is down.
index_eversion=Your system is using Bacula version $2, but this Webmin module only supports versions $1 and above.
index_dir=Director Configuration
@@ -48,6 +49,9 @@ check_engmod=The OpenCountry Bacula groups module is not installed
proc_bacula-sd=Storage daemon
proc_bacula-fd=File daemon
proc_bacula-dir=Bacula Director daemon
proc_bareos-sd=Storage daemon
proc_bareos-fd=File daemon
proc_bareos-dir=Bacula Director daemon
stop_err=Failed to stop Bacula
start_err=Failed to start Bacula