X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=c536a948bbd1f98a7d5d1ff45a4726574e94f18d;hb=e3aaf9e253e242ed83a566464c85edf4d609f153;hp=ba15e6cec5f48275dbb696b4b427b1e0865ad46b;hpb=a4496a23900af3d62f9cad5a67984c397b1a6e72;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index ba15e6cec..c536a948b 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,21 +10,33 @@ 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       = '5.153.231.19'
+	$bacula_director_address  = 'dinis.debian.org'
 	$bacula_director_port     = 9101
-	$bacula_storage_address   = 'beethoven.debian.org'
+	$bacula_storage_address   = 'storace.debian.org'
 	$bacula_storage_port      = 9103
-	$bacula_client_port       = 9102
+	$bacula_client_port       = hiera('bacula_fd_port', 9102)
 	$bacula_db_address        = 'danzi.debian.org'
 	$bacula_db_port           = 5433
 
 	$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}")
+
+	$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/private/thishost.key'
+	$bacula_ssl_server_cert   = '/etc/ssl/debian/certs/thishost-server.crt'
+	$bacula_ssl_server_key    = '/etc/ssl/private/thishost-server.key'
+
+	file { '/usr/local/sbin/bacula-idle-restart':
+		mode    => '0555',
+		content  => template('bacula/bacula-idle-restart.erb'),
+	}
+
 }