X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bacula-conf.patch;h=9256bc9c7a7493fe3df037cbbe083bfaf66c5c43;hb=b403dd64f5ae313617ea78070e0875c382db1a80;hp=cfcd217a79f09ef273ee36d27cfb3f40853eaf94;hpb=f252534875e43edb40c4cc1523cbe3a11064666a;p=packages%2Fbacula.git

diff --git a/bacula-conf.patch b/bacula-conf.patch
index cfcd217..9256bc9 100644
--- a/bacula-conf.patch
+++ b/bacula-conf.patch
@@ -1,15 +1,25 @@
 diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bacula-dir.conf.in
 --- bacula-2.2.6.org/src/dird/bacula-dir.conf.in	2007-10-03 18:22:07.000000000 +0200
 +++ bacula-2.2.6/src/dird/bacula-dir.conf.in	2007-11-24 22:44:44.660275104 +0100
+@@ -231,8 +231,7 @@
+ # Generic catalog service
+ 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@
++  dbdriver = "dbi:mysql"; dbaddress = 127.0.0.1; dbport = 3306
+   dbname = "@db_name@"; dbuser = "@db_user@"; dbpassword = "@db_password@"
+ }
+ 
 @@ -256,7 +256,7 @@
  #          time to time as it will grow indefinitely. However, it will
  #          also keep all your messages if they scroll off the console.
  #
 -  append = "@working_dir@/log" = all, !skipped
 +  append = "/var/log/bacula/log" = all, !skipped
+   catalog = all
  }
  
- 
 @@ -267,7 +267,7 @@
    mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
    mail = @job_email@ = all, !skipped            
@@ -19,14 +29,3 @@ diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bac
  }
  
  
-diff -urN bacula-2.2.6.org/autoconf/configure.in bacula-2.2.6/autoconf/configure.in
---- bacula-2.2.6.org/autoconf/configure.in	2007-10-24 20:37:02.000000000 +0200
-+++ bacula-2.2.6/autoconf/configure.in	2007-11-24 22:54:17.646345227 +0100
-@@ -172,6 +172,7 @@
-     archivedir=${archivedir}
- fi
- archivedir=`eval echo ${archivedir}`
-+[ -z "$archivedir" ] && archivedir=/tmp
- 
- # -------------------------------------------------------------------------
- #  If the user has not set --mandir, we default to /usr/share/man