X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fbacula-dir.conf.in;h=b1505056e7f739dd14df4e6c54bac10e98ac8d4e;hb=44566f589dd96e4414e38ec4bf7d76b22fbcd9aa;hp=bb56eacb042686fc4165c25db1564aa44fca56ad;hpb=5b184affc3614dbfd9ec8311b5f635f89d1ecda2;p=bacula%2Fbacula

diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in
index bb56eacb04..b1505056e7 100644
--- a/bacula/src/dird/bacula-dir.conf.in
+++ b/bacula/src/dird/bacula-dir.conf.in
@@ -20,7 +20,7 @@ Director {                            # define myself
   PidDirectory = "@piddir@"
   Maximum Concurrent Jobs = 1
   Password = "@dir_password@"         # Console password
-  Messages = Standard
+  Messages = Daemon
 }
 
 JobDefs {
@@ -46,6 +46,13 @@ Job {
   Write Bootstrap = "@working_dir@/Client1.bsr"
 }
 
+#Job {
+#  Name = "Client2"
+#  Client = @hostname@2-fd
+#  JobDefs = "DefaultJob"
+#  Write Bootstrap = "@working_dir@/Client2.bsr"
+#}
+
 # Backup the catalog database (after the nightly save)
 Job {
   Name = "BackupCatalog"
@@ -54,18 +61,25 @@ Job {
   FileSet="Catalog"
   Schedule = "WeeklyCycleAfterBackup"
   # This creates an ASCII copy of the catalog
-  RunBeforeJob = "@scriptdir@/make_catalog_backup -u bacula"
+  RunBeforeJob = "@scriptdir@/make_catalog_backup bacula bacula"
   # This deletes the copy of the catalog
   RunAfterJob  = "@scriptdir@/delete_catalog_backup"
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
   Priority = 11                   # run after main backup
 }
 
+#
 # Standard Restore template, to be changed by Console program
+#  Only one such job is needed for all Jobs/Clients/Storage ...
+#
 Job {
   Name = "RestoreFiles"
-  JobDefs = "DefaultJob"
   Type = Restore
+  Client=@hostname@-fd                 
+  FileSet="Full Set"                  
+  Storage = File                      
+  Pool = Default
+  Messages = Standard
   Where = /tmp/bacula-restores
 }
 
@@ -73,12 +87,15 @@ Job {
 # List of files to be backed up
 FileSet {
   Name = "Full Set"
-  Include = signature=MD5 { 
+  Include {
+    Options {
+      signature = MD5
+    }
 #    
-#  Put your list of files here, one per line or include an
-#    external list with:
+#  Put your list of files here, preceded by 'File =', one per line
+#    or include an external list with:
 #
-#    <file-name
+#    File = <file-name
 #
 #  Note: / backs up everything on the root partition.
 #    if you have other partitons such as /usr or /home
@@ -88,14 +105,19 @@ FileSet {
 #    directory to give a reasonable FileSet to backup to
 #    disk storage during initial testing.
 #
-    @BUILD_DIR@
+    File = @BUILD_DIR@
   }
 
 #
 # If you backup the root directory, the following two excluded
 #   files can be useful
 #
-  Exclude = { /proc /tmp /.journal /.fsck }
+  Exclude {
+    File = /proc
+    File = /tmp
+    File = /.journal
+    File = /.fsck
+  }
 }
 
 #
@@ -104,22 +126,25 @@ FileSet {
 #  and incremental backups other days
 Schedule {
   Name = "WeeklyCycle"
-  Run = Full 1st sun at 1:05
-  Run = Differential 2nd-5th sun at 1:05
-  Run = Incremental mon-sat at 1:05
+  Run = Full 1st sun at 23:05
+  Run = Differential 2nd-5th sun at 23:05
+  Run = Incremental mon-sat at 23:05
 }
 
 # This schedule does the catalog. It starts after the WeeklyCycle
 Schedule {
   Name = "WeeklyCycleAfterBackup"
-  Run = Full sun-sat at 1:10
+  Run = Full sun-sat at 23:10
 }
 
 # This is the backup of the catalog
 FileSet {
   Name = "Catalog"
-  Include = signature=MD5 {
-     @working_dir@/bacula.sql
+  Include {
+    Options {
+      signature = MD5
+    }
+    File = @working_dir@/bacula.sql
   }
 }
 
@@ -135,9 +160,26 @@ Client {
   AutoPrune = yes                     # Prune expired Jobs/Files
 }
 
-# Definiton of file storage device
+#
+# Second Client (File Services) to backup
+#  You should change Name, Address, and Password before using
+#
+#Client {
+#  Name = @hostname@2-fd                
+#  Address = @hostname@2
+#  FDPort = @fd_port@
+#  Catalog = MyCatalog
+#  Password = "@fd_password@2"         # password for FileDaemon 2
+#  File Retention = 30 days            # 30 days
+#  Job Retention = 6 months            # six months
+#  AutoPrune = yes                     # Prune expired Jobs/Files
+#}
+
+
+# Definition of file storage device
 Storage {
   Name = File
+# Do not use "localhost" here    
   Address = @hostname@                # N.B. Use a fully qualified name here
   SDPort = @sd_port@
   Password = "@sd_password@"
@@ -146,19 +188,23 @@ Storage {
 }
 
 
+
 # Definition of DDS tape storage device
 #Storage {
 #  Name = DDS-4    
+#  Do not use "localhost" here
 #  Address = @hostname@                # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"          # password for Storage daemon
 #  Device = DDS-4                      # must be same as Device in Storage daemon
 #  Media Type = DDS-4                  # must be same as MediaType in Storage daemon
+#  Autochanger = yes                   # enable for autochanger device
 #}
 
 # Definition of 8mm tape storage device
 #Storage {
 #  Name = "8mmDrive"
+#  Do not use "localhost" here
 #  Address = @hostname@                # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"
@@ -166,6 +212,17 @@ Storage {
 #  MediaType = "8mm"
 #}
 
+# Definition of DVD storage device
+#Storage {
+#  Name = "DVD"
+#  Do not use "localhost" here
+#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  SDPort = @sd_port@
+#  Password = "@sd_password@"
+#  Device = "DVD Writer"
+#  MediaType = "DVD"
+#}
+
 
 # Generic catalog service
 Catalog {
@@ -177,6 +234,18 @@ Catalog {
 #  and to the console
 Messages {
   Name = Standard
+#
+# NOTE! If you send to two email or more email addresses, you will need
+#  to replace the %r in the from field (-f part) with a single valid
+#  email address in both the mailcommand and the operatorcommand.
+#  What this does is, it sets the email address that emails would display
+#  in the FROM field, which is by default the same email as they're being
+#  sent to.  However, if you send email to more than one address, then
+#  you'll have to set the FROM address manually, to a single address. 
+#  for example, a 'no-reply@mydomain.com', is better since that tends to
+#  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"
   mail = @job_email@ = all, !skipped            
@@ -189,6 +258,20 @@ Messages {
 #
   append = "@working_dir@/log" = all, !skipped
 }
+
+
+#
+# Message delivery for daemon messages (no job).
+Messages {
+  Name = Daemon
+  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 {
@@ -197,5 +280,13 @@ Pool {
   Recycle = yes                       # Bacula can automatically recycle Volumes
   AutoPrune = yes                     # Prune expired volumes
   Volume Retention = 365 days         # one year
-  Accept Any Volume = yes             # write on any volume in the pool
+}
+
+#
+# Restricted console used by tray-monitor to get the status of the director
+#
+Console {
+  Name = @hostname@-mon
+  Password = "@mon_dir_password@"
+  CommandACL = status, .status
 }