X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=4fd0f6dc3d29091cab4700de6e5c973b6286319d;hb=a2aea510648d1d58789365a2d0b7bae76fcca37b;hp=4ae22ca1200f941f589d5108532a56ff4bbea68e;hpb=562fab891e679381498a8676f8c3ca81f41c96f4;p=dsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 4ae22ca1..4fd0f6dc 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -11,6 +11,12 @@ class bacula::director inherits bacula {
 		require   => Package['bacula-director-pgsql']
 	}
 
+	exec { 'bacula-director reload':
+		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+		command     => 'service bacula-director reload',
+		refreshonly => true,
+	}
+
 	file { '/etc/bacula/conf.d':
 		ensure  => directory,
 		mode    => '0755',
@@ -19,7 +25,7 @@ class bacula::director inherits bacula {
 		force   => true,
 		recurse => true,
 		source  => 'puppet:///files/empty/',
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 
 	file { '/etc/bacula/bacula-dir.conf':
@@ -27,13 +33,13 @@ class bacula::director inherits bacula {
 		mode    => '0440',
 		group   => bacula,
 		require => Package['bacula-director-pgsql'],
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 
 	@ferm::rule { 'dsa-bacula-dir':
-		domain      => '(ip ip6)',
+		domain      => '(ip)',
 		description => 'Allow bacula access from localhost',
-		rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
+		rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_ip} localhost) ACCEPT",
 	}
 
 	file { '/etc/bacula/conf.d/empty.conf':
@@ -41,7 +47,7 @@ class bacula::director inherits bacula {
 		mode    => '0440',
 		group   => bacula,
 		require => Package['bacula-director-pgsql'],
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 
 	Bacula::Node<<| |>>
@@ -56,4 +62,22 @@ class bacula::director inherits bacula {
 		group   => bacula,
 		require => Package['bacula-console']
 	}
+
+	file { '/etc/bacula/scripts/volume-purge-action':
+		mode    => '0555',
+		source  => 'puppet:///modules/bacula/volume-purge-action',
+		;
+	}
+	file { '/etc/bacula/storages-list.d':
+		ensure  => directory,
+		mode    => '0755',
+		group   => bacula,
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+	}
+	file { "/etc/cron.d/puppet-bacula-stuff":
+		content => "@daily root (cat /etc/bacula/storages-list.d/*.storage; echo '$bacula::bacula_filestor_name-catalog') | /etc/bacula/scripts/volume-purge-action\n";
+	}
 }