X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=ddaa838df980ae431b653697ccac6e90816e9ac1;hb=3a8728abb0195e34cd5745ee100e5b6e3c254824;hp=740ba7f7b5f742441d5f5299cbb2d0f339db1736;hpb=8d6d2e6c2143d19a529e5f5e98b60945a5980e24;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 740ba7f7b..ddaa838df 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -1,6 +1,6 @@
 class bacula {
 
-	$bacula_operator_email    = 'debian-admin@debian.org'
+	$bacula_operator_email    = 'bacula-reports@admin.debian.org'
 
 	$bacula_director_name     = 'debian-dir'
 	$bacula_storage_name      = 'debian-sd'
@@ -10,9 +10,9 @@ class bacula {
 	$bacula_filestor_device   = 'FileStorage'
 	$bacula_pool_name         = 'debian'
 
-	# $bacula_director_address  = 'dinis.debian.org'
 	# use IP address for ferm.
-	$bacula_director_address  = '206.12.19.139'
+	$bacula_director_ip       = '206.12.19.139'
+	$bacula_director_address  = 'dinis.debian.org'
 	$bacula_director_port     = 9101
 	$bacula_storage_address   = 'beethoven.debian.org'
 	$bacula_storage_port      = 9103
@@ -22,20 +22,15 @@ class bacula {
 
 	$bacula_backup_path       = '/srv/bacula'
 
-	$bacula_director_secret   = hmac('/etc/puppet/secret', "bacula-dir-${::hostname}")
-	$bacula_db_secret         = hmac('/etc/puppet/secret', "bacula-db-${::hostname}")
-	$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}")
+	$bacula_director_secret   = hkdf('/etc/puppet/secret', "bacula-dir-${::hostname}")
+	$bacula_db_secret         = hkdf('/etc/puppet/secret', "bacula-db-${::hostname}")
+	$bacula_storage_secret    = hkdf('/etc/puppet/secret', "bacula-sd-${bacula_storage_name}")
+	$bacula_client_secret     = hkdf('/etc/puppet/secret', "bacula-fd-${::fqdn}")
+	$bacula_monitor_secret    = hkdf('/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']
-	}
+	$bacula_ca_path           = '/etc/ssl/debian/certs/ca.crt'
+	$bacula_ssl_client_cert   = '/etc/ssl/debian/certs/thishost.crt'
+	$bacula_ssl_client_key    = '/etc/ssl/debian/keys/thishost.key'
+	$bacula_ssl_server_cert   = '/etc/ssl/debian/certs/thishost-server.crt'
+	$bacula_ssl_server_key    = '/etc/ssl/debian/keys/thishost-server.key'
 }