X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=f3d6f68ec52e8faba0b72697df5d80b88bc6011d;hb=d2f41d6cc64287591ac5c97a1fae9adb4f848d36;hp=93c696294ff04f035a3bf4a6cc260fe287b0714e;hpb=7867f0f9fb6c63dbcc4c4730744fcdec6351edaa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 93c696294..f3d6f68ec 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -11,6 +11,13 @@ 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 +26,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,16 +34,33 @@ 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",
 	}
 
-	$clients = ['berlioz.debian.org', 'biber.debian.org', 'draghi.debian.org', 'widor.debian.org', 'wolkenstein.debian.org']
-	bacula::node { $clients: }
+	file { '/etc/bacula/conf.d/empty.conf':
+		content => '',
+		mode    => '0440',
+		group   => bacula,
+		require => Package['bacula-director-pgsql'],
+		notify  => Exec['bacula-director reload']
+	}
 
+	Bacula::Node<<| |>>
+
+	package { 'bacula-console':
+		ensure => installed;
+	}
+
+	file { '/etc/bacula/bconsole.conf':
+		content => template('bacula/bconsole.conf.erb'),
+		mode    => '0640',
+		group   => bacula,
+		require => Package['bacula-console']
+	}
 }