X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=8128fde45153545e7f006987771dbc3ec11296a8;hb=89469455ad73de68cdcdcf53cab2a3f566937d78;hp=80b4755dee88a525213d788d55077336a99c8e48;hpb=c0a2aa7bfdcb0d56ec24e0ad98d5f248a995fd70;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 80b4755de..8128fde45 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -6,8 +6,6 @@
 # @param port_sd          port for the sd to listen on
 # @param storage_name     bacula name of this sd instance
 # @param storage_address  address of this sd instance that other instances should connect to (dns name)
-# @param has_ipv4         SD should listen on ipv4
-# @param has_ipv6         SD should listen on ipv6
 class bacula::storage (
   String $backup_path     = '/srv/bacula',
   String $filestor_device = 'FileStorage',
@@ -15,8 +13,6 @@ class bacula::storage (
   Integer $port_sd        = 9103,
   String $storage_name    = "${::fqdn}-sd",
   Stdlib::Host $storage_address = $::fqdn,
-  Boolean $has_ipv4        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
-  Boolean $has_ipv6        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
 ) inherits bacula {
 
   package { 'bacula-sd':
@@ -30,6 +26,8 @@ class bacula::storage (
   }
   dsa_systemd::override { 'bacula-sd':
     content => @(EOT)
+      [Unit]
+      After=network-online.target unbound.service
       [Service]
       Group=bacula
       SupplementaryGroups=ssl-cert
@@ -40,7 +38,7 @@ class bacula::storage (
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
     command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_sd} bacula-sd &'",
     refreshonly => true,
-    subscribe   => File[$bacula::bacula_ssl_server_cert],
+    subscribe   => File[$bacula::ssl_server_cert],
     require     => File['/usr/local/sbin/bacula-idle-restart'],
   }
 
@@ -59,7 +57,6 @@ class bacula::storage (
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
     notify  => Exec['bacula-sd restart-when-idle']
   }