fix typo

[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 2a5f4356ef853291b150ef913bb4600ddaebbd68..080d59a08a1183133160c7b43f1f212b8555284b 100644 (file)
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -13,7 +13,7 @@
 #
 
 Director {                            # define myself
-  Name = @hostname@-dir
+  Name = @basename@-dir
   DIRport = @dir_port@                # where we listen for UA connections
   QueryFile = "@scriptdir@/query.sql"
   WorkingDirectory = "@working_dir@"
@@ -27,30 +27,29 @@ JobDefs {
   Name = "DefaultJob"
   Type = Backup
   Level = Incremental
-  Client = @hostname@-fd 
+  Client = @basename@-fd 
   FileSet = "Full Set"
   Schedule = "WeeklyCycle"
   Storage = File
   Messages = Standard
-  Pool = Default
+  Pool = File
   Priority = 10
+  Write Bootstrap = "@working_dir@/%c.bsr"
 }
 
 
 #
 # 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"
+  Name = "BackupClient1"
   JobDefs = "DefaultJob"
-  Write Bootstrap = "@working_dir@/Client1.bsr"
 }
 
 #Job {
-#  Name = "Client2"
-#  Client = @hostname@2-fd
+#  Name = "BackupClient2"
+#  Client = @basename@2-fd
 #  JobDefs = "DefaultJob"
-#  Write Bootstrap = "@working_dir@/Client2.bsr"
 #}
 
 # Backup the catalog database (after the nightly save)
@@ -61,10 +60,12 @@ Job {
   FileSet="Catalog"
   Schedule = "WeeklyCycleAfterBackup"
   # This creates an ASCII copy of the catalog
-  RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula"
+  # 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
 }
 
@@ -75,12 +76,12 @@ Job {
 Job {
   Name = "RestoreFiles"
   Type = Restore
-  Client=@hostname@-fd                 
+  Client=@basename@-fd                 
   FileSet="Full Set"                  
   Storage = File                      
   Pool = Default
   Messages = Standard
-  Where = /tmp/bacula-restores
+  Where = @archivedir@/bacula-restores
 }
 
 
@@ -98,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@
   }
 
 #
@@ -113,6 +114,8 @@ FileSet {
 #   files can be useful
 #
   Exclude {
+    File = @working_dir@
+    File = @archivedir@
     File = /proc
     File = /tmp
     File = /.journal
@@ -144,13 +147,13 @@ FileSet {
     Options {
       signature = MD5
     }
-    File = @working_dir@/bacula.sql
+    File = "@working_dir@/@db_name@.sql"
   }
 }
 
 # Client (File Services) to backup
 Client {
-  Name = @hostname@-fd
+  Name = @basename@-fd
   Address = @hostname@
   FDPort = @fd_port@
   Catalog = MyCatalog
@@ -165,7 +168,7 @@ Client {
 #  You should change Name, Address, and Password before using
 #
 #Client {
-#  Name = @hostname@2-fd                
+#  Name = @basename@2-fd                
 #  Address = @hostname@2
 #  FDPort = @fd_port@
 #  Catalog = MyCatalog
@@ -227,7 +230,9 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = bacula; user = bacula; 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
@@ -246,8 +251,8 @@ Messages {
 #  tell (most) people that its coming from an automated source.
 
 #
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
-  operatorcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: %t %e of %c %l\" %r"
+  operatorcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: Intervention needed for %j\" %r"
   mail = @job_email@ = all, !skipped            
   operator = @job_email@ = mount
   console = all, !skipped, !saved
@@ -257,6 +262,7 @@ Messages {
 #          also keep all your messages if they scroll off the console.
 #
   append = "@working_dir@/log" = all, !skipped
+  catalog = all
 }
 
 
@@ -264,15 +270,12 @@ Messages {
 # Message delivery for daemon messages (no job).
 Messages {
   Name = Daemon
-  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
+  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
   mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
   append = "@working_dir@/log" = all, !skipped
 }
 
-
-
-    
 # Default pool definition
 Pool {
   Name = Default
@@ -282,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
@@ -292,7 +307,7 @@ Pool {
 # Restricted console used by tray-monitor to get the status of the director
 #
 Console {
-  Name = @hostname@-mon
+  Name = @basename@-mon
   Password = "@mon_dir_password@"
   CommandACL = status, .status
 }