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=d63229dcb3d41f2703161761171c8839f281f8ca;hpb=7078770bf6bf50fecb8dac96388fbecaa93a8e9f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index d63229dcb..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
@@ -32,6 +32,8 @@ Director {
   # This is a server certificate, used for incoming console connections.
   TLS Certificate = "<%= @bacula_ssl_server_cert %>"
   TLS Key = "<%= @bacula_ssl_server_key %>"
+
+  Heartbeat Interval = 60
 }
 
 ########################################################################
@@ -67,6 +69,8 @@ FileSet {
     File = /srv/chroot
     File = /sys
     File = /tmp
+    File = /srv/apache-cache/mod_cache_disk
+    File = /var/cache/apache2/mod_cache_disk
     File = /var/cache/apt
     File = /var/lib/apt
     File = /var/lib/bacula
@@ -119,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 %>"
 }
@@ -137,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
 }
@@ -147,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
 }
 
@@ -168,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
@@ -227,7 +235,7 @@ Pool {
   Label Format = "<%= @bacula_pool_name %>-catalog.${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}_${Hour:p/2/0/r}:${Minute:p/2/0/r}"
   Volume Use Duration = 23h
   Maximum Volume Jobs = 1
-  Maximum Volume Bytes = 50G
+  Maximum Volume Bytes = 500G
   Action On Purge = Truncate
   Recycle = yes
   RecyclePool = "poolcataloggraveyard-<%=@bacula_pool_name%>"