Remove need for bacula command, make DB host configurable

diff --git a/bacula-backup/CHANGELOG b/bacula-backup/CHANGELOG
index 9dbe888..c4020d8 100644 (file)
--- a/bacula-backup/CHANGELOG
+++ b/bacula-backup/CHANGELOG
@@ -1,2 +1,4 @@
 ---- Changes since 1.350 ----
 First version of this module, which allows Bacula to be configured and both backups and restores to be executed.
+---- Changes since 1.360 ----
+Removed the requirement for the /etc/bacula/bacula command to be installed, if /etc/init.d/bacula-* scripts exist.

diff --git a/bacula-backup/bacula-backup-lib.pl b/bacula-backup/bacula-backup-lib.pl
index 133de45..4d7a015 100644 (file)
--- a/bacula-backup/bacula-backup-lib.pl
+++ b/bacula-backup/bacula-backup-lib.pl
@@ -439,9 +439,9 @@ if (!-d $config{'bacula_dir'}) {
        }
 local $got = 0;
 if (-r $dir_conf_file) {
-       if (!-x $bacula_cmd) {
-               return &text('check_ebacula', "<tt>$bacula_cmd</tt>");
-               }
+       #if (!-x $bacula_cmd) {
+       #       return &text('check_ebacula', "<tt>$bacula_cmd</tt>");
+       #       }
        if (!-x $console_cmd) {
                return &text('check_econsole', "<tt>$console_cmd</tt>");
                }

diff --git a/bacula-backup/config.info b/bacula-backup/config.info
index 6d5cc1c..cb91bbe 100644 (file)
--- a/bacula-backup/config.info
+++ b/bacula-backup/config.info
@@ -7,6 +7,7 @@ line1=Bacula database settings,11
 driver=Database type,1,Pg-PostgreSQL,mysql-MySQL,SQLite-SQLite
 user=User to login to database as,0
 pass=Password to login with,0
+host=Bacula database server,3,This system
 db=Database or file containing Bacula information,0
 line2=File settings,11
 bacula_dir=Bacula configuration directory,0

diff --git a/bacula-backup/module.info b/bacula-backup/module.info
index 7d27b87..f2ab431 100644 (file)
--- a/bacula-backup/module.info
+++ b/bacula-backup/module.info
@@ -1,5 +1,4 @@
 desc=Bacula Backup System
 category=system
-version=0.4
 depends=proc cron 1.250
 longdesc=Configure Bacula to perform backups and restores manually or on schedule, for one or many systems.