X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=f82ee547489a76ec7c0e454120f08e14270e9fa0;hb=54b3cfe88cd6e52e3029df1a11595dafdb016ae5;hp=d57280de0d22831c9edc98f39318136c95bc4dba;hpb=6a6f323df04506d53a2d5fb8e30765ec216877d9;p=dsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index d57280de..f82ee547 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,11 @@ class bacula {
 	$bacula_filestor_device   = 'FileStorage'
 	$bacula_pool_name         = 'debian'
 
+	# use IP address for ferm.
+	$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_address   = 'backuphost.debian.org'
 	$bacula_storage_port      = 9103
 	$bacula_client_port       = 9102
 	$bacula_db_address        = 'danzi.debian.org'
@@ -20,20 +22,21 @@ 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;
-	}
+	$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'
 
-	file { '/etc/bacula/bconsole.conf':
-		content => template('bacula/bconsole.conf.erb'),
-		mode    => '0640',
-		group   => bacula,
-		require => Package['bacula-console']
+	file { '/usr/local/sbin/bacula-idle-restart':
+		mode    => '0555',
+		source  => 'puppet:///modules/bacula/bacula-idle-restart',
 	}
+
 }