X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fdirector.pp;h=0afd927f1cc4bb1a08ff1fedc733a7483911b606;hb=eee4d993e0d4ad03aaaa2b8de1ad450660ee139c;hp=f1a76a46b44f4f7fa539207f3b2c853652678a41;hpb=b139a41f4f8d0f0165fc9f8c5d2e90b4bd8af07d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index f1a76a46b..0afd927f1 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,23 +33,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",
 	}
 
-	file { '/etc/bacula/conf.d/empty':
+	file { '/etc/bacula/conf.d/empty.conf':
 		content => '',
 		mode    => '0440',
 		group   => bacula,
 		require => Package['bacula-director-pgsql'],
-		notify  => Service['bacula-director']
+		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']
+	}
 }