X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Finit.pp;h=aa0c9de547baacf5a166da14d8d9c985dd3462a3;hb=91259d8d44b9568967cc7773f203a7f108e4512c;hp=cbbc3966632e645d3b69491789d85f8d8d7788eb;hpb=6e22738574b0e389499218e47c66794020bd7ee3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index cbbc39666..aa0c9de54 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -1,6 +1,6 @@
 class bacula {
 
-	$bacula_operator_email    = 'bacula-reports@debian.org'
+	$bacula_operator_email    = 'bacula-reports@admin.debian.org'
 
 	$bacula_director_name     = 'debian-dir'
 	$bacula_storage_name      = 'debian-sd'
@@ -11,12 +11,12 @@ class bacula {
 	$bacula_pool_name         = 'debian'
 
 	# use IP address for ferm.
-	$bacula_director_ip       = '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
 
@@ -30,7 +30,16 @@ class bacula {
 
 	$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_client_key    = '/etc/ssl/private/thishost.key'
 	$bacula_ssl_server_cert   = '/etc/ssl/debian/certs/thishost-server.crt'
-	$bacula_ssl_server_key    = '/etc/ssl/debian/keys/thishost-server.key'
+	$bacula_ssl_server_key    = '/etc/ssl/private/thishost-server.key'
+
+	$bacula_dsa_client_list   = '/etc/bacula/dsa-clients'
+	$tag_bacula_dsa_client_list = "bacula::dsa::clientlist"
+
+	file { '/usr/local/sbin/bacula-idle-restart':
+		mode    => '0555',
+		content  => template('bacula/bacula-idle-restart.erb'),
+	}
+
 }