From: Marcin Krol Date: Tue, 24 Jun 2014 06:07:01 +0000 (+0000) Subject: - updated for 7.0.4 X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=db58cbddc8fdf941c8580841a5735c53526106f2;p=packages%2Fbacula.git - updated for 7.0.4 --- diff --git a/bacula-conf.patch b/bacula-conf.patch index 6ee1e71..e640ad9 100644 --- a/bacula-conf.patch +++ b/bacula-conf.patch @@ -1,17 +1,14 @@ -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 @@ +--- bacula-7.0.4/src/dird/bacula-dir.conf.in 2014-06-03 08:28:41.000000000 +0000 ++++ bacula-7.0.4/src/dird/bacula-dir.conf.in 2014-06-23 11:46:44.185855989 +0000 +@@ -231,6 +231,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@" } -@@ -256,7 +256,7 @@ +@@ -260,7 +261,7 @@ # time to time as it will grow indefinitely. However, it will # also keep all your messages if they scroll off the console. # @@ -20,12 +17,12 @@ diff -urN bacula-2.2.6.org/src/dird/bacula-dir.conf.in bacula-2.2.6/src/dird/bac catalog = all } -@@ -267,7 +267,7 @@ +@@ -272,7 +273,7 @@ mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r" - mail = @job_email@ = all, !skipped + mail = @job_email@ = all, !skipped console = all, !skipped, !saved - append = "@logdir@/bacula.log" = all, !skipped + append = "@logdir@/log" = all, !skipped } - + # Default pool definition