X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=dd5395df664d533aaae971551c31c222e323a5da;hb=f1c1f8989e7404dbb5139855407b647544179c14;hp=486df2e8493f0797ed2750cab2c01a586f759f36;hpb=42e20fefad3765c8635a9144dda741c23fff4b81;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 486df2e84..dd5395df6 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}"),
@@ -63,7 +63,7 @@ class bacula::director(
   dsa_systemd::override { 'bacula-director':
     content => @(EOT)
       [Unit]
-      After=unbound.service
+      After=network-online.target unbound.service
       | EOT
   }
 
@@ -99,8 +99,8 @@ class bacula::director(
     notify  => Exec['bacula-director reload']
   }
 
-  Bacula::Director::Client             <<| tag == "bacula::to-director::${::fqdn}" |>>
   Bacula::Director::Client_from_storage<<| tag == "bacula::to-director::${::fqdn}" |>>
+  Bacula::Director::Client             <<| tag == "bacula::to-director::${::fqdn}" |>>
 
   package { 'bacula-console':
     ensure => installed;
@@ -148,11 +148,7 @@ class bacula::director(
   }
 
   concat { $bacula::bacula_dsa_client_list:
-  }
-  concat::fragment { 'bacula-dsa-client-list::header' :
-    target  => $bacula::bacula_dsa_client_list,
-    content => '',
-    order   => '00',
+    ensure_newline => true,
   }
   Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>