Revert "Since the conditional does not work for default values for params, fall back...

[mirror/dsa-puppet.git] / modules / bacula / manifests / director.pp

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 9843e55..dd5395d 100644 (file)
--- 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;