X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=0dfe83f200012123fa52d5b2eb824242b2f846ac;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=f5e8a3d4bbcc688ea31b6980a6ff5dfffb66e567;hpb=cf4213775621619c69e4ebe9fa61ef268d98e881;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index f5e8a3d4b..0dfe83f20 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -14,14 +14,14 @@ Director {
   Description = <%= @hostname %> - <%= @domain %> Bacula Director
   QueryFile = "/etc/bacula/scripts/query.sql"
   WorkingDirectory = "/var/lib/bacula"
-  PidDirectory = "/var/run/bacula"
+  PidDirectory = "/run/bacula"
   Maximum Concurrent Jobs = 20
   Password = "<%= @bacula_director_secret %>"
   Messages = Daemon
   DirAddresses = {
      # Always have localhost in, then the configured IP
      ip = { addr = 127.0.0.1; port = 9101 }
-	 ip = { addr = <%=@bacula_director_address%>; port = <%=@bacula_director_port%> }
+     ip = { addr = <%=@bacula_director_address%>; port = <%=@bacula_director_port%> }
   }
 
   TLS Enable = yes
@@ -33,7 +33,7 @@ Director {
   TLS Certificate = "<%= @bacula_ssl_server_cert %>"
   TLS Key = "<%= @bacula_ssl_server_key %>"
 
-  Heartbeat Interval = 180
+  Heartbeat Interval = 60
 }
 
 ########################################################################
@@ -123,9 +123,11 @@ Schedule {
 ########################################################################
 Catalog {
   Name = MyCatalog
-  dbname = "service = bacula";
-  #DB Address = "<%= @bacula_db_address %>";
-  #DB Port = <%= @bacula_db_port %>;
+  dbname = bacula;
+  dbport = 5437;
+  dbaddress = bmdb1.debian.org;
+  dbsslmode = verify-ca;
+  dbsslca = /etc/ssl/debian/certs/ca.crt;
   dbuser = "bacula";
   dbpassword = "<%= @bacula_db_secret %>"
 }
@@ -141,6 +143,7 @@ Messages {
   mail = <%= @bacula_operator_email %> = all
   operator = <%= @bacula_operator_email %> = mount
   console = all, !skipped, !saved
+  syslog = all
   append = "/var/lib/bacula/log" = all
   catalog = all
 }
@@ -151,6 +154,7 @@ Messages {
   mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
   mail = <%= @bacula_operator_email %> = all
   console = all, !skipped, !saved
+  syslog = all
   append = "/var/lib/bacula/log" = all
 }
 
@@ -172,9 +176,9 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Accurate = yes
-  Schedule = "WeeklyCycle"
+  # Schedule = "WeeklyCycle"
   Messages = Standard
-  Max Full Interval = 40 days
+  Max Full Interval = 50 days
   Priority = 10
   Write Bootstrap = "/var/lib/bacula/%c.bsr"
   Maximum Concurrent Jobs = 20