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=45b91724cdddb33294628ad57d418b92545a218f;hpb=0e54cd56f798ea46f72993862b7c7dc4b0a6122c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 45b91724c..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
@@ -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 %>"
 }