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

diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index a33f5967d..b48eedcb9 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -1,4 +1,5 @@
 class bacula::director inherits bacula {
+	bacula::node { $::fqdn: }
 
 	package { ['bacula-director-pgsql', 'bacula-common', 'bacula-common-pgsql']:
 		ensure => installed
@@ -12,15 +13,16 @@ class bacula::director inherits bacula {
 	}
 
 	file { '/etc/bacula/conf.d':
-		ensure => directory,
-		mode   => '0755',
-		group  => bacula,
-		purge  => true,
-		notify => Service['bacula-director']
+		ensure  => directory,
+		mode    => '0755',
+		group   => bacula,
+		purge   => true,
+		force   => true,
+		recurse => true,
+		source  => 'puppet:///files/empty/',
+		notify  => Service['bacula-director']
 	}
 
-	Bacula::Node<<| |>>
-
 	file { '/etc/bacula/bacula-dir.conf':
 		content => template('bacula/bacula-dir.conf.erb'),
 		mode    => '0440',
@@ -34,4 +36,25 @@ class bacula::director inherits bacula {
 		description => 'Allow bacula access from localhost',
 		rule        => "proto tcp mod state state (NEW) dport (bacula-dir) saddr (${bacula_director_address} localhost) ACCEPT",
 	}
+
+	file { '/etc/bacula/conf.d/empty.conf':
+		content => '',
+		mode    => '0440',
+		group   => bacula,
+		require => Package['bacula-director-pgsql'],
+		notify  => Service['bacula-director']
+	}
+
+	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']
+	}
 }