ebl fix segfault with debug mode

[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 7190fbd35693bbf88edb27c98430b035d93691ba..c39275d5d0803d7158563dae1d91b1daebeb59f3 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -39,7 +39,7 @@ JobDefs {
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @archivedir@
 Job {
   Name = "Client1"
   JobDefs = "DefaultJob"
@@ -61,7 +61,11 @@ Job {
   FileSet="Catalog"
   Schedule = "WeeklyCycleAfterBackup"
   # This creates an ASCII copy of the catalog
-  RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula"
+  # 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@"
   # This deletes the copy of the catalog
   RunAfterJob  = "@scriptdir@/delete_catalog_backup"
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
@@ -80,7 +84,7 @@ Job {
   Storage = File                      
   Pool = Default
   Messages = Standard
-  Where = /tmp/bacula-restores
+  Where = @archivedir@/bacula-restores
 }
 
 
@@ -227,7 +231,9 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = @db_name@; user = @db_user@; password = ""
+# Uncomment the following line if you want the dbi driver
+@uncomment_dbi@ dbdriver = "dbi:@DB_TYPE@"; dbaddress = 127.0.0.1; dbport = @db_port@
+  dbname = "@db_name@"; dbuser = "@db_user@"; dbpassword = "@db_password@"
 }
 
 # Reasonable message delivery -- send most everything to email address