X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=e707f5e604ea961459c7d77b35c91da11ef8c5c6;hb=aba30e8586e4d77bd3d5f7bdc8481259d4d0a3b6;hp=d3835be4a0b7e1f3e4803d67f045848d9bc488e0;hpb=11958888b106376c4566dcecb16234f060267a3c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index d3835be4a..e707f5e60 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -123,12 +123,14 @@ Schedule {
 ########################################################################
 Catalog {
   Name = MyCatalog
-  dbname = bacula;
-  dbport = 5432;
-  dbaddress = postgresql-manda-01.debian.org;
+  dbname = <%= @db_name %>;
+  dbport = <%= @db_port %>;
+  dbaddress = "<%= @db_address %>";
   dbsslmode = verify-ca;
-  dbsslca = /etc/ssl/debian/certs/ca.crt;
-  dbuser = "bacula";
+<% if @db_sslca %>
+  dbsslca = "<%= @db_sslca %>";
+<% end %>
+  dbuser = "<%= @db_user %>";
   dbpassword = "<%= @bacula_db_secret %>"
 }