Put db port and address into configuration too

diff --git a/modules/bacula/manifests/bacula.pp b/modules/bacula/manifests/bacula.pp
index 78ec0620952221b887be83a4f14bb8afd30f1955..3cf9b6742f335ab0a0a7d0e5fc536af1f010038c 100644 (file)
--- a/modules/bacula/manifests/bacula.pp
+++ b/modules/bacula/manifests/bacula.pp
@@ -15,10 +15,13 @@ class bacula {
   $bacula_storage_address   = "beethoven.debian.org"
   $bacula_storage_port      = 9103
   $bacula_client_port       = 9102
+  $bacula_db_address        = "danzi.debian.org"
+  $bacula_db_port           = 5433
 
   $bacula_backup_path       = "/srv/backup.debian.org/bacula"
 
   $bacula_director_secret   = hmac("/etc/puppet/secret", "bacula-dir-$hostname")
+  $bacula_db_secret         = hmac("/etc/puppet/secret", "bacula-db-$hostname")
   $bacula_storage_secret    = hmac("/etc/puppet/secret", "bacula-sd-$hostname")
   $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-$hostname")
   $bacula_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-$hostname")

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 9549b25ec830ac4e395c063ab846fe7edfc11d2e..a1444a6277108d9e48f1d6b9ed28885334e5cf32 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -95,7 +95,11 @@ Schedule {
 ########################################################################
 Catalog {
   Name = MyCatalog
-  dbname = bacula; DB Address = ""; dbuser = "bacula"; dbpassword = "s3kr1t"
+  dbname = bacula;
+  DB Address = "<%= bacula_db_address %>";
+  DB Port = <%= bacula_db_port %>;
+  dbuser = "bacula";
+  dbpassword = "<%= bacula_db_secret %>"
 }
 
 ########################################################################