X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=8769aebb4a2a851135e5e0b2624bc45ee4d2b6c5;hb=8efc3cb29ac84aed50f87cc92ad50a6d21a10f8a;hp=2c5d0533f037940c93c78212877b51d4f41a2153;hpb=57ad37658ba4a8f9f8423dd617089c083e517aa3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 2c5d0533f..8769aebb4 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,8 +1,13 @@
+# our bacula director
 class bacula::director inherits bacula {
 
-  package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
-    ensure => installed
-  }
+  ensure_packages ( [
+   'bacula-director-pgsql',
+   'bacula-common',
+   'bacula-common-pgsql'
+  ], {
+    ensure => 'installed',
+  })
 
   service { 'bacula-director':
     ensure    => running,
@@ -89,8 +94,8 @@ class bacula::director inherits bacula {
   }
 
   file { "/etc/cron.d/puppet-bacula-stuff": ensure => absent, }
-  concat::fragment { 'dsa-puppet-stuff--bacula-director':
-    target => '/etc/cron.d/dsa-puppet-stuff',
+  concat::fragment { 'puppet-crontab--bacula-director':
+    target => '/etc/cron.d/puppet-crontab',
     content  => @(EOF)
       @daily root chronic /etc/bacula/scripts/volume-purge-action -v
       @daily root chronic /etc/bacula/scripts/volumes-delete-old -v