From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Sep 2019 22:40:26 +0000 (+0200)
Subject: move director db pw to a more local thing
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fa1f55f5cae79899e96c42865eef3878d0cbfb3d;p=mirror%2Fdsa-puppet.git

move director db pw to a more local thing
---

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 5aaa061ba..ff41e1bb2 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -5,6 +5,7 @@
 # @param db_port        port of the postgres server for the catalog DB
 # @param db_name        DB name for the catalog DB
 # @param db_user        username for the postgres server for the catalog DB
+# @param db_password    password for the postgres server for the catalog DB
 # @param port_dir       Port that the director should listen on
 # @param db_sslca       SSL CA store for DB access
 # @param director_name  bacula name of this dir instance
@@ -14,6 +15,7 @@ class bacula::director(
   Integer $db_port,
   String  $db_name = 'bacula',
   String  $db_user = 'bacula',
+  String  $db_password = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"),
   String  $pool_name = 'bacula',
   Integer $port_dir = 9101,
   Optional[String] $db_sslca = undef,
diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 7b78df816..f5cc52d6e 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -5,8 +5,6 @@ class bacula (
   String  $bacula_operator_email      = 'bacula-reports@admin.debian.org',
   String  $bacula_director_name       = 'debian-dir',
 
-  String  $bacula_db_secret           = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}"),
-
   String  $bacula_ca_path             = '/etc/ssl/debian/certs/ca.crt',
   String  $bacula_ssl_client_cert     = '/etc/ssl/debian/certs/thishost.crt',
   String  $bacula_ssl_client_key      = '/etc/ssl/private/thishost.key',
diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 84a7bbf7a..e94ce587c 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -96,7 +96,7 @@ Catalog {
   dbsslca = "<%= @db_sslca %>";
 <% end %>
   dbuser = "<%= @db_user %>";
-  dbpassword = "<%= @bacula_db_secret %>"
+  dbpassword = "<%= @db_password %>"
 }
 
 ########################################################################