Keep the same keywords as in previous version

[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 b0d30e06cb519f2c6c1d39d2820d7afa59e7ed36..080d59a08a1183133160c7b43f1f212b8555284b 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -32,8 +32,9 @@ JobDefs {
   Schedule = "WeeklyCycle"
   Storage = File
   Messages = Standard
-  Pool = Default
+  Pool = File
   Priority = 10
+  Write Bootstrap = "@working_dir@/%c.bsr"
 }
 
 
@@ -41,16 +42,14 @@ JobDefs {
 # Define the main nightly save backup job
 #   By default, this job will back up to disk in @archivedir@
 Job {
-  Name = "Client1"
+  Name = "BackupClient1"
   JobDefs = "DefaultJob"
-  Write Bootstrap = "@working_dir@/Client1.bsr"
 }
 
 #Job {
-#  Name = "Client2"
+#  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
 }
 
@@ -102,14 +99,14 @@ FileSet {
 #    File = <file-name
 #
 #  Note: / backs up everything on the root partition.
-#    if you have other partitons such as /usr or /home
+#    if you have other partitions such as /usr or /home
 #    you will probably want to add them too.
 #
-#  By default this is defined to point to the Bacula build
+#  By default this is defined to point to the Bacula binary
 #    directory to give a reasonable FileSet to backup to
 #    disk storage during initial testing.
 #
-    File = @BUILD_DIR@
+    File = @sbindir@
   }
 
 #
@@ -117,6 +114,8 @@ FileSet {
 #   files can be useful
 #
   Exclude {
+    File = @working_dir@
+    File = @archivedir@
     File = /proc
     File = /tmp
     File = /.journal
@@ -148,7 +147,7 @@ FileSet {
     Options {
       signature = MD5
     }
-    File = @working_dir@/bacula.sql
+    File = "@working_dir@/@db_name@.sql"
   }
 }
 
@@ -263,6 +262,7 @@ Messages {
 #          also keep all your messages if they scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all
 }
 
 
@@ -276,9 +276,6 @@ Messages {
   append = "@working_dir@/log" = all, !skipped
 }
 
-
-
-    
 # Default pool definition
 Pool {
   Name = Default
@@ -288,6 +285,18 @@ Pool {
   Volume Retention = 365 days         # one year
 }
 
+# File Pool definition
+Pool {
+  Name = File
+  Pool Type = Backup
+  Recycle = yes                       # Bacula can automatically recycle Volumes
+  AutoPrune = yes                     # Prune expired volumes
+  Volume Retention = 365 days         # one year
+  Maximum Volume Bytes = 50G          # Limit Volume size to something reasonable
+  Maximum Volumes = 100               # Limit number of Volumes in Pool
+}
+
+
 # Scratch pool definition
 Pool {
   Name = Scratch