From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Aug 2012 07:30:07 +0000 (+0200)
Subject: bconsole is only needed on the director
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=a4496a23900af3d62f9cad5a67984c397b1a6e72

bconsole is only needed on the director
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 8a09872c..6347a8e9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,6 +43,14 @@ node default {
 
 	if $::hostname == 'dinis' {
 		include bacula::director
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
+
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
 	if $::hostname == 'beethoven' {
diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index b3fc7a50..4ae22ca1 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -46,4 +46,14 @@ class bacula::director inherits bacula {
 
 	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']
+	}
 }
diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 740ba7f7..ba15e6ce 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -27,15 +27,4 @@ class bacula {
 	$bacula_storage_secret    = hmac('/etc/puppet/secret', "bacula-sd-${bacula_storage_name}")
 	$bacula_client_secret     = hmac('/etc/puppet/secret', "bacula-fd-${::fqdn}")
 	$bacula_monitor_secret    = hmac('/etc/puppet/secret', "bacula-monitor-${bacula_director_name}")
-
-	package { 'bacula-console':
-		ensure => installed;
-	}
-
-	file { '/etc/bacula/bconsole.conf':
-		content => template('bacula/bconsole.conf.erb'),
-		mode    => '0640',
-		group   => bacula,
-		require => Package['bacula-console']
-	}
 }