Remove ifdeffing that turned off JS_Warning status -- must have been missed test...

[bacula/bacula] / bacula / src / dird / bacula-dir.conf.in

diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index 226de50517c755ce144e577047ac92e232b46ce6..5793ea1ff52cee7a48de338e46f62bb96d21b6fb 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -34,6 +34,7 @@ JobDefs {
   Messages = Standard
   Pool = File
   Priority = 10
+  Write Bootstrap = "@working_dir@/%c.bsr"
 }
 
 
@@ -43,14 +44,12 @@ JobDefs {
 Job {
   Name = "BackupClient1"
   JobDefs = "DefaultJob"
-  Write Bootstrap = "@working_dir@/Client1.bsr"
 }
 
 #Job {
 #  Name = "BackupClient2"
 #  Client = @basename@2-fd
 #  JobDefs = "DefaultJob"
-#  Write Bootstrap = "@working_dir@/Client2.bsr"
 #}
 
 # Backup the catalog database (after the nightly save)
@@ -61,14 +60,12 @@ Job {
   FileSet="Catalog"
   Schedule = "WeeklyCycleAfterBackup"
   # This creates an ASCII copy of the catalog
-  # WARNING!!! Passing the password via the command line is insecure.
-  # see comments in make_catalog_backup for details.
-  # Arguments to make_catalog_backup are:
-  #  make_catalog_backup <database-name> <user-name> <password> <host>
-  RunBeforeJob = "@scriptdir@/make_catalog_backup @db_name@ @db_user@"
+  # Arguments to make_catalog_backup.pl are:
+  #  make_catalog_backup.pl <catalog-name>
+  RunBeforeJob = "@scriptdir@/make_catalog_backup.pl MyCatalog"
   # This deletes the copy of the catalog
   RunAfterJob  = "@scriptdir@/delete_catalog_backup"
-  Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
+  Write Bootstrap = "@working_dir@/%n.bsr"
   Priority = 11                   # run after main backup
 }
 
@@ -150,7 +147,7 @@ FileSet {
     Options {
       signature = MD5
     }
-    File = @working_dir@/bacula.sql
+    File = "@working_dir@/@db_name@.sql"
   }
 }
 
@@ -234,7 +231,7 @@ Storage {
 Catalog {
   Name = MyCatalog
 # Uncomment the following line if you want the dbi driver
-@uncomment_dbi@ dbdriver = "dbi:@DB_TYPE@"; dbaddress = 127.0.0.1; dbport = @db_port@
+@uncomment_dbi@ dbdriver = "dbi:@DEFAULT_DB_TYPE@"; dbaddress = 127.0.0.1; dbport = @db_port@
   dbname = "@db_name@"; dbuser = "@db_user@"; dbpassword = "@db_password@"
 }