Try to wait for both network-online *and* unbound

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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 83d0253..98ea8a6 100644 (file)
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -58,11 +58,9 @@ class bacula::client(
     }
 
     @@concat::fragment { "bacula-dsa-client-list::${client}":
-      target  => $bacula::bacula_dsa_client_list ,
-      content => @("EOF"),
-          ${client}
-          | EOF
       tag     => $bacula::tag_bacula_dsa_client_list,
+      target  => $bacula::bacula_dsa_client_list,
+      content => $client,
     }
 
     # allow access from director
@@ -102,7 +100,7 @@ class bacula::client(
     ensure  => $ensure,
     content => @(EOF),
       [Unit]
-      After=unbound.service
+      After=network-online.target unbound.service
       [Service]
       ExecStart=
       ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
@@ -113,7 +111,7 @@ class bacula::client(
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
     command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_fd} bacula-fd &'",
     refreshonly => true,
-    subscribe   => [ File[$bacula::bacula_ssl_server_cert], File[$bacula::bacula_ssl_client_cert] ],
+    subscribe   => [ File[$bacula::ssl_server_cert], File[$bacula::ssl_client_cert] ],
     require     => [ File['/usr/local/sbin/bacula-idle-restart'], File['/etc/bacula/fd-conf.d/empty.conf'] ],
   }