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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index e44ed7c04..dd5395df6 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -10,18 +10,19 @@
 # @param db_sslca       SSL CA store for DB access
 # @param director_name  bacula name of this dir instance
 # @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}"),
   String  $pool_name = 'bacula',
   Integer $port_dir = 9101,
   Optional[String] $db_sslca = undef,
-  #String $director_name    = "${::fqdn}-dir",
-  String $director_name = $bacula::bacula_director_name,
+  String $director_name = "${::fqdn}-dir",
   Stdlib::Host $director_address = $::fqdn,
+  String $messages_name = "Msg-${::fqdn}",
 ) inherits bacula {
 
   # used by e.g. bconsole
@@ -35,12 +36,14 @@ class bacula::director(
     tag              => 'bacula::to-storage',
     director_name    => $director_name,
     director_address => $director_address,
+    messages_name    => $messages_name,
   }
   # let FDs know we exist
   @@bacula::client::director{ $::fqdn:
     tag              => "bacula::to-fd::${director_address}",
     director_name    => $director_name,
     director_address => $director_address,
+    messages_name    => $messages_name,
   }
 
   ensure_packages ( [
@@ -60,7 +63,7 @@ class bacula::director(
   dsa_systemd::override { 'bacula-director':
     content => @(EOT)
       [Unit]
-      After=unbound.service
+      After=network-online.target unbound.service
       | EOT
   }
 
@@ -77,7 +80,6 @@ class bacula::director(
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
     notify  => Exec['bacula-director reload']
   }
 
@@ -97,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;
@@ -129,7 +131,6 @@ class bacula::director(
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
   }
   file { '/usr/local/sbin/dsa-bacula-scheduler':
     source => 'puppet:///modules/bacula/dsa-bacula-scheduler',
@@ -139,19 +140,15 @@ class bacula::director(
   file { '/etc/cron.d/puppet-bacula-stuff': ensure => absent, }
   concat::fragment { 'puppet-crontab--bacula-director':
     target  => '/etc/cron.d/puppet-crontab',
-    content => @(EOF)
+    content => @("EOF"/$)
       @daily root chronic /etc/bacula/scripts/volume-purge-action -v
-      @daily root chronic /etc/bacula/scripts/volumes-delete-old -v
-      */3 * * * * root sleep $(( $RANDOM \% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
+      @daily root chronic /etc/bacula/scripts/volumes-delete-old -v --token '${pool_name}'
+      */3 * * * * root sleep $(( \$RANDOM \\% 60 )); flock -w 0 -e /usr/local/sbin/dsa-bacula-scheduler /usr/local/sbin/dsa-bacula-scheduler
       | EOF
   }
 
   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 |>>