X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fbacula.pp;h=6643e0996b638d1fe023d856586575146f97363b;hb=c429f34b4841fc1c41eac251fc2e9203704b1164;hp=3724c1bfa3c7b64df9ba8d6c97f7fbe4690c6e4e;hpb=a1651904682381906e07507601bda4dd732f58ff;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/bacula.pp b/modules/bacula/manifests/bacula.pp
index 3724c1bfa..6643e0996 100644
--- a/modules/bacula/manifests/bacula.pp
+++ b/modules/bacula/manifests/bacula.pp
@@ -4,7 +4,7 @@ class bacula {
 
   $bacula_director_name     = "debian-dir"
   $bacula_storage_name      = "debian-sd"
-  $bacula_client_name       = "$hostname-fd"
+  $bacula_client_name       = "$fqdn-fd"
   $bacula_monitor_name      = "debian-mon"
   $bacula_filestor_name     = "File"
   $bacula_filestor_device   = "FileStorage"
@@ -12,16 +12,19 @@ class bacula {
 
   $bacula_director_address  = "dinis.debian.org"
   $bacula_director_port     = 9101
-  $bacula_storage_address   = "jommeli.debian.org"
+  $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_backup_path       = "/srv/bacula"
 
   $bacula_director_secret   = hmac("/etc/puppet/secret", "bacula-dir-$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")
+  $bacula_db_secret         = hmac("/etc/puppet/secret", "bacula-db-$hostname")
+  $bacula_storage_secret    = hmac("/etc/puppet/secret", "bacula-sd-$bacula_storage_name")
+  $bacula_client_secret     = hmac("/etc/puppet/secret", "bacula-fd-$fqdn")
+  $bacula_monitor_secret    = hmac("/etc/puppet/secret", "bacula-monitor-$bacula_director_name")
 
   package {
     "bacula-console": ensure => installed;