From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 12:57:31 +0000 (+0200)
Subject: defaults for db_address, db_port; move dbsslmode = verify-ca into the case where... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=b0fb3eef1181d5a01bdf8b3418191e2005c11b35

defaults for db_address, db_port; move dbsslmode = verify-ca into the case where we have a dbsslca
---

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 9843e5523..93e38d812 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -12,8 +12,8 @@
 # @param director_address  address of this dir instance that other instances should connect to (dns name)
 # @param messages_name   name of the Messages Resource
 class bacula::director(
-  String  $db_address,
-  Integer $db_port,
+  String  $db_address = 'localhost',
+  Integer $db_port = 5432,
   String  $db_name = 'bacula',
   String  $db_user = 'bacula',
   String  $db_password = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"),
diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index e481622d1..f714ea20c 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -90,8 +90,8 @@ Catalog {
   dbname = <%= @db_name %>;
   dbport = <%= @db_port %>;
   dbaddress = "<%= @db_address %>";
-  dbsslmode = verify-ca;
 <% if @db_sslca %>
+  dbsslmode = verify-ca;
   dbsslca = "<%= @db_sslca %>";
 <% end %>
   dbuser = "<%= @db_user %>";