X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=ed53174a0ef424ccf1c3da3957bd18d55241c3ce;hb=1070137fdc4e4594d6ad4bfef27f696d5f209147;hp=bf2ed30d060c739dfff4b425c440911a6cbbc002;hpb=a205711a76860949eada466938644cb77ffacdc0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index bf2ed30d0..ed53174a0 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
@@ -27,4 +27,16 @@ class bacula {
 	$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/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 { '/usr/local/sbin/bacula-idle-restart':
+		mode    => '0555',
+		source  => 'puppet:///modules/bacula/bacula-idle-restart',
+	}
+
 }