completly disable 'lockmgr'

[packages/bacula.git] / bacula-conf.patch

diff --git a/bacula-conf.patch b/bacula-conf.patch
index b1cd2ae506a58388d667d1d58817c990124a1b91..f34fba2f21bd4f056d7583902501dccd79da3cd4 100644 (file)
--- a/bacula-conf.patch
+++ b/bacula-conf.patch
@@ -1,21 +1,30 @@
-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
-@@ -256,7 +256,7 @@
+--- bacula-5.2.12/src/dird/bacula-dir.conf.in.orig     2012-09-13 10:51:19.000000000 +0200
++++ bacula-5.2.12/src/dird/bacula-dir.conf.in  2012-10-22 17:09:44.886778298 +0200
+@@ -230,8 +230,7 @@
+ # Generic catalog service
+ Catalog {
+   Name = MyCatalog
+-# Uncomment the following line if you want the dbi driver
+-@uncomment_dbi@ dbdriver = "dbi:@DEFAULT_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@"
+ }
+ 
+@@ -261,7 +260,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 = "@logdir@/bacula.log" = all, !skipped
 +  append = "/var/log/bacula/log" = all, !skipped
+   catalog = all
  }
  
- 
-@@ -267,7 +267,7 @@
+@@ -273,7 +272,7 @@
    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
+-  append = "@logdir@/bacula.log" = all, !skipped
 +  append = "/var/log/bacula/log" = all, !skipped
  }
  
- 
+ # Default pool definition